close #59 bug fix