Make R16 compatible