Hi Tom,

Could you try the attached patch and let me know if it fixes the
problem?

If so I'll apply it to the main repo.

Thanks -- Eric