fixed Issue #308