Fixing issue #91