Fixing REGISTRY-2251 - As  a result of CARBON-14867 fix