Fix for CARBON-15021