diff --git a/CUETools.CDImage/CDImage.cs b/CUETools.CDImage/CDImage.cs
index 0b5f936..b66924e 100644
--- a/CUETools.CDImage/CDImage.cs
+++ b/CUETools.CDImage/CDImage.cs
@@ -319,7 +319,7 @@ namespace CUETools.CDImage
 		{
 			get
 			{
-				return _tracks[0].Pregap;
+                return _tracks[_firstAudio].Pregap;
 			}
 		}
 
@@ -368,7 +368,7 @@ namespace CUETools.CDImage
 		{
 			get
 			{
-				return AudioTracks > 0 ? _tracks[_firstAudio + _audioTracks - 1].End + 1U - _tracks[_firstAudio].Start + _tracks[_firstAudio].Pregap : 0U;
+				return AudioTracks > 0 ? _tracks[_firstAudio + _audioTracks - 1].End + 1U - _tracks[_firstAudio][0].Start : 0U;
 			}
 		}
 
diff --git a/CUETools/CUETools.TestProcessor/Test Images/Les Mysterieuses Cites d'Or/2.cue b/CUETools/CUETools.TestProcessor/Test Images/Les Mysterieuses Cites d'Or/2.cue
index f6fcedc..a4b188d 100644
--- a/CUETools/CUETools.TestProcessor/Test Images/Les Mysterieuses Cites d'Or/2.cue	
+++ b/CUETools/CUETools.TestProcessor/Test Images/Les Mysterieuses Cites d'Or/2.cue	
@@ -3,7 +3,7 @@ REM DISCID F211631F
 REM COMMENT "ExactAudioCopy v0.99pb5"
 FILE "03.dummy" WAVE
   TRACK 01 AUDIO
-    PREGAP 00:00:03
+    PREGAP 00:03:00
     INDEX 01 00:00:00
 FILE "04.dummy" WAVE
   TRACK 02 AUDIO
diff --git a/CUETools/CUETools.TestProcessor/Test Images/Les Mysterieuses Cites d'Or/Les Mysterieuses Cites d'Or.cue b/CUETools/CUETools.TestProcessor/Test Images/Les Mysterieuses Cites d'Or/Les Mysterieuses Cites d'Or.cue
index aeb1759..5f2345d 100644
--- a/CUETools/CUETools.TestProcessor/Test Images/Les Mysterieuses Cites d'Or/Les Mysterieuses Cites d'Or.cue	
+++ b/CUETools/CUETools.TestProcessor/Test Images/Les Mysterieuses Cites d'Or/Les Mysterieuses Cites d'Or.cue	
@@ -8,7 +8,7 @@ FILE "<Filename>.iso" BINARY
     INDEX 00 07:04:02
 FILE "03.dummy" WAVE
   TRACK 03 AUDIO
-    PREGAP 00:00:03
+    PREGAP 00:03:00
     INDEX 01 00:00:00
 FILE "04.dummy" WAVE
   TRACK 04 AUDIO