Hi,
I have created the patch to fix this issue.
Please review it.
Thanks