- Fix counting issue