Adjusted waypoint check following routing fix