Fix case where counts are not all set