Fixing indexation