fixing REGISTRY-2155