Attaching a patch to fix this issue.