Fixed for moved op code