Fixed reindexing