adding fix for REGISTRY-2298