Fix instant waypoint bug