added emacs pop fix