Improves reliability of goto when wait is True (Controller)