Fixed another waypoint counter issue.