Make this emacs24.2 compliant