Yet again, IndexOutOfBoundsException. Revert 9bcec74