fix r16 compatibility