Emacs 24 bug work-around