Fixing issue #100