Here's the patch to fix this issue.