Fix for latest Vim specification