Fix opcodes error on 6.0.2