Add back emacs 23
Try to make compatible with emacs 23