Build fix
Merge pull request #1040 from marcel-blonk/BRIDGE-68

Build fix