Fix IndexOutofBounds