Fix for REGISTRY-2321