use proper next hop in strict routing mode (issue #3609)