Fix an issue with ID conflicts.