more index fix Part 2