Update to fix issue #1