fixed Issue #173