Fixing REGISTRY-2262