fixed Issue #2