Fixing issue #1