Enhanced close #6