So I’ve just encountered this problem again yesterday. This time I decided to take a closer look and see what I could do to fix it once and for all. As it turns out only very few lines are needed to handle this specific case.
I’ve submitted a Pull Request #2468 with the necessary changes.
If you don’t want to wait, here is the commit
Edit: forgot to mention, my change is based on the 4.11.0 release branch