Fix indexation with no storage