Fixing up index