Fixing Issue #93