[expression builder] fixes #11247