Fixing issue #6
Fixing issue #6
Fixing issue #7