Fixing issue #2