fixed Issue #10 bug