Fix Issue #93