fixing OutOfBoundsException, #2894