fix for REGISTRY-2181

fix for REGISTRY-2181