Added bug fix for Emacs 24.3
Fixed conflicts