Make sure manually set GUID does not get overridden