Please try the attached patch.

Thanks
Ted