Hopefully fix IndexOutOfBoundsException