Fix Issue #88