Fixed indexing of new objects