Fix another IndexOutOfBoundsException