Fix for counting issue.