fixed Issue #235