Fixed counters, for real this time