better 16 bit code support