Fixing REGISTRY-2268