fix for CARBON-14862