Fix R class