Fix index out of bounds

Change-Id: Id288c01ab7e39fb16e7247030dbb76183436cb79
2 files changed