Seems to have fixed the issue for me. However, I only did some quick tests, so
perhaps leave this bug open for a few more days so I can test if there are
still some corner cases where it breaks.

Thank you so muck Alex! :)