r2 index changes for bug fixing