Fixed indexing flow.