Fixed some stuff with the indexation system