Bugfix: ArrayIndexOutOfBoundsException