Fixed to use std. Emacs