fix R16 compatibility issue