Add compatability with emacs < 24