Fixing issue #114