I've started work on a patch for this problem.
Doing regression tests at present.
I'll get back when done.
Regards,
John