Fixed OutOfBoundsException