Fix the counters bug (#983)