Fix R8 code