ArrayIndexOutOfBounds Fix