fix R2 plural
merge with master about R2 fix