fixed Issue #21