Still some problems to solve with indexing