Patch to fix #3