fixed Issue #208