Patch which fixes the issue