Fix the count feature.