Trying to fix issue #3
Fixing issue #3