Fix for REGISTRY-2353