Fix Expression definition