fixed Issue #273