reverting fix of loss of last waypoint -- there were actually no loss