Hack to work with latest Neovim