Trying to fix issue #3