Adjusted for Emacs-24.4