Fix issue matching operands