close #62, close #58