fixing REGISTRY-2253