Fixed Issue #89