- Fixed OutOfBound problem