Fixing index Part 2