fixed Issue #200