Fixed index for real this time