fix go to waypoint