fixed Issue #1