indexing bugfix