[new index structure] Fixed iterator invalidation bug.