Here is the patch which looks to fix the issue.