Patch to fix this: