Indexing fix

Another indexing fix