This fixes an isuse that can occur when we have concurrent calls to `Stop` while the state machine is driving forward.