+ fix expressions