Fixing issue #83