Fix R16 compatibility (stop using pmod)