Fix for BRIDGE-132