fixed GUID conflicts