Fixing max/avg counts