Fix but with waypoint object