Fixed for works correctly in emacs 24.4