bug fixed in production
so r2_index branch completed coding