semi fixed waypoints issue