Fix up index