Fix for CARBON-14767