fixed Issue #3