Correct the count handling.