fixed Issue #18