Counters bug fix