Fix for Emacs 25.x