Fixing issue #93