UniqueId still a problem