Fixed the expression builder.