Attempt to fix issue #2