Fix Issue #101