better handling from Emacs