fixed Issue #723