You might be right and the code might be wrong, care to send a patch for
it correcting the issue?

Would be glad to do that, if I am able to resolve the issue.
Meanwhile, any insights from anybody on this would be welcome!

Regards,
Felix.