Nexthop field is now correct for non-default gateways