Fix R3F system