Fix index out of bounds