fix for REGISTRY-2174