some adjustments in roll opcode handler