Trying to fix issue #10