Fix auto-add waypoints