Unique id fix2