This should fix counters