Fixed stateful indexer.