more opcode fix for 5.2
check needed