Fixing issue #110