Fix index out of bounds error