Fix r1_val issue with previous commit