fix for CARBON-14728