fixed Issue #134