fix expression builder