Fix for latest emacs