Fixed duped UUIDs