Fix race condition in Vim

Happens if trying to simultaneously stop at line and handle the command
Merge branch 'fix-race'