Fixing waypoints