Fixed #2 ArrayIndexOutOfBoundsException