Trying to fix issue #2