Here's a patch that tries to fix this issue. I already tested it, but
please do so also just in case.


Respectfully, Adonay.