Fixed indexer bug