Fix so it works in latest Emacs