Fixed an ArrayIndexOutOfBoundsException