Fix to not depend on vimshell