Improved enabling/disabling of RR