solved Issue #59