Fix R3 compatibility