fixed Issue #16