Fixing issue #20