fix for REGISTRY-2368