Fix r2