Adding fix for CARBON-14855