Fixed 3-1*-1 bug (but not -(1)^2 bug)