Hack to avoid a crash with the new --emacs flag