fix waypoints issue