BRIDGE-88 fix