close #40, close #53