Little indexing bug fixed