Fixing remaining counting issue in organizer.