fix Issue #89