fixed Issue #298