ArrayBounds fix