Indexing allocations fixed