Make it work with Emacs 24.4