Fixing REGISTRY-2183