Trying to correct the indexing.