[BUGFIX] fixed regression which broke indexing