Fix slowdown in RR2 or may be others