Fixed 1-based indexation bug