Fix issue with unique identifiers.