diff --git a/src/BizHawk.Emulation.DiscSystem/DiscFormats/CCD_format.cs b/src/BizHawk.Emulation.DiscSystem/DiscFormats/CCD_format.cs
index 9ea69bebce..e85dfd7946 100644
--- a/src/BizHawk.Emulation.DiscSystem/DiscFormats/CCD_format.cs
+++ b/src/BizHawk.Emulation.DiscSystem/DiscFormats/CCD_format.cs
@@ -417,7 +417,7 @@ namespace BizHawk.Emulation.DiscSystem
 					//but in order to make a high quality CCD which can be inspected by various other tools, we need it
 					//now, regarding the indexes.. theyre truly useless. having indexes written out with the tracks is bad news.
 					//index information is only truly stored in subQ
-					for (var tnum = session.FirstInformationTrack.Number; tnum <= session.LastInformationTrack.Number; tnum++)
+					for (var tnum = 1; tnum <= session.InformationTrackCount; tnum++)
 					{
 						var track = session.Tracks[tnum];
 						sw.WriteLine("[TRACK {0}]", track.Number);
diff --git a/src/BizHawk.Emulation.DiscSystem/DiscFormats/CDI_format.cs b/src/BizHawk.Emulation.DiscSystem/DiscFormats/CDI_format.cs
index dbe4aadb52..bbc0f48240 100644
--- a/src/BizHawk.Emulation.DiscSystem/DiscFormats/CDI_format.cs
+++ b/src/BizHawk.Emulation.DiscSystem/DiscFormats/CDI_format.cs
@@ -587,7 +587,7 @@ namespace BizHawk.Emulation.DiscSystem
 
 				var TOCMiscInfo = new Synthesize_A0A1A2_Job(
 					firstRecordedTrackNumber: trackOffset + 1,
-					lastRecordedTrackNumber: trackOffset + cdif.Sessions[i].NumTracks + 1,
+					lastRecordedTrackNumber: trackOffset + cdif.Sessions[i].NumTracks,
 					sessionFormat: (SessionFormat)(cdif.Tracks[trackOffset + cdif.Sessions[i].NumTracks - 1].SessionType * 0x10),
 					leadoutTimestamp: disc._Sectors.Count);
 				TOCMiscInfo.Run(session.RawTOCEntries);