Fix for emacs24.4