Specific fix for R1

This should not be integrated back.