Fixed index out of bounds