fixed Issue #93