fixed Issue #97