This has recently been addressed in `emacs` with a series of 3 commits
each trying to fix it slightly differently.
I don't know how to reproduce the original proble, so if it affects you,
can you try the most recent `master` and see if it still affects you?