fixed Issue #204