Here is the patch to fix this issue.