messy waypointfile fix