Fix a bug where the waypoint would be treated as a destination