Fix operand matching with spaces