Correct the index
Merge branch 'local'

* local:
  Correct the index