Fix waypoint BS