Fix for REGISTRY-2342