fix expressions