OutOfBounderies fix