Ok. When you have the patch please attach it to this ticket.

Please make a small self-contained test case as well, which I can then add to the package's testsuite.