am fb658d6c: Fix possible ArrayIndexOutOfBoundsException

* commit 'fb658d6c531de8cfd55e4d36bffc9ccabc401f94':
  Fix possible ArrayIndexOutOfBoundsException