Fix waypoint_order when not set