close #3 and close #49