Fix behaviour for emacs 24.* < emacs 24.3