Final Fix to Indexing