Fixing issue #108