Lars Hansen wrote:

> I would rather like to see if I can come up with a fix.

The attached patch seems to fix the bug.