[expression builder] fixes #11247
Merge pull request #1589 from slarosa/fix11247

[expression builder] fixes #11247