Fix collection indexed by $index
Fix collection indexed by $index