Fix for CARBON-14990