Use the patch from the issue queue