Fixed index layout issue