fixed Issue #24