Small adjustment to start collecting indexes