close #599

close #599