Patch file that fixes this issue