Fix duplicate GUID