add workaround for Emacs bug#16796