* re-added check to not finish if waypoints in progress