fixed Issue #59