Fixing Index step 2

- Fixing Index step 2