fix waypoint gen