Fixed index issue