Enhanced close #20