Guid fix