Fix index out of range