Fixing issue #10