Hi,
I have created a patch to resolve your probems. Please review and lat me ...