Fix Waypoint for armevp