Fix for support of non-emacs editors