0487: Reversing to third waitPoint fix