fix for CARBON-14874