Fixed waypoints changing strangely.