fixed Issue #35