waypoints bug fixed