Fix #1383 - and probably other bugs, too.
Fix #1383 - and probably other bugs, too.

westim/Vim,Chillee/VSCodeNeovim,Chillee/VSCodeNeovim,Chillee/Vim,Chillee/Vim,VSCodeVim/Vim,VSCodeVim/Vim,westim/Vim,Chillee/VSCodeNeovim,westim/Vim