2.1.0-P09 (fix ArrayIndexOutOfBoundsException)