Counting fix