Fix GUID