Update Waypoints fix