Partial fix for remoteNextHop