fixed Issue #90