fix bug
Merge branch 'hotfix/array_index_bugfix'