fixed Issue #54