Fix Issue #89