fixed Issue #26