Fixed a bug causing operators to be matched in an expression too often
Fixed a critical bug