Fixed problem with indexing (again)
Merged conflicts