Attached a patch that fixes the issue.