GUID fix