fix for sharing unique identifier issue