Fix expression parser