Fix current_item_count counter