I've now tested my patch in PR 676 and it works.

Here's a ChangeLog and the patch again.

Thanks,
Nick