Fix #1 for Array out of bounds