Fixed clean operand string regex again