Attempt to fix issue #1