corrected opcode mapping