Patch to solve this bug