fixed Issue #23