fix for REGISTRY-2181