Make array more bigger, and bounds check the thing. Change-Id: Iaffebefd27c16c6ecf57566803859be1a5049b8a