Update CancelWait to reset after cancel