Revert "index fix"

This reverts commit e070335d107c5486cf76162828e62633f87a643c.