fixing REGISTRY-2264