Serializing unique id fix