Indexing still appears to be wrong