fixed Issue #116