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