fixed Issue #423