Fix for REGISTRY-2310