Merge "index correction"