Fix indexation