Fixed index problem