am da4b7e89: Merge "Fix possible array access issue"

* commit 'da4b7e8979e9b7de634aecee62da6ce867ccaa8d':
  Fix possible array access issue