Indexing

Split up the indexing issue into two commits and solved the issue in a way that only one line is affected.