Fix for REGISTRY-2147