Fix for 16 bit opcodes