Hopefully fixed incremental indexing