Patch to fix issue #1