Fix close #7