Fix statistics to count for all type