Add counter to close #1