diff --git a/whipper/command/cd.py b/whipper/command/cd.py
index 1c0130d1..ab10771f 100644
--- a/whipper/command/cd.py
+++ b/whipper/command/cd.py
@@ -443,17 +443,17 @@ def _ripIfNotRipped(number):
                     logger.debug('HTOA peak %r is equal to the SILENT '
                                  'threshold, disregarding', trackResult.peak)
                     self.itable.setFile(1, 0, None,
-                                        self.ittoc.getTrackStart(1), number)
+                                        self.itable.getTrackStart(1), number)
                     logger.debug('unlinking %r', trackResult.filename)
                     os.unlink(trackResult.filename)
                     trackResult.filename = None
                     logger.info('HTOA discarded, contains digital silence')
                 else:
                     self.itable.setFile(1, 0, trackResult.filename,
-                                        self.ittoc.getTrackStart(1), number)
+                                        self.itable.getTrackStart(1), number)
             else:
                 self.itable.setFile(number, 1, trackResult.filename,
-                                    self.ittoc.getTrackLength(number), number)
+                                    self.itable.getTrackLength(number), number)
 
             self.program.saveRipResult()
 
@@ -482,7 +482,7 @@ def _ripIfNotRipped(number):
         self.program.write_m3u(discName)
 
         try:
-            self.program.verifyImage(self.runner, self.ittoc)
+            self.program.verifyImage(self.runner, self.itable)
         except accurip.EntryNotFound:
             logger.warning('AccurateRip entry not found')
 
diff --git a/whipper/common/program.py b/whipper/common/program.py
index e618a051..96686b09 100644
--- a/whipper/common/program.py
+++ b/whipper/common/program.py
@@ -96,7 +96,7 @@ def getFastToc(self, runner, device):
             logger.warning('cdrdao older than 1.2.3 has a pre-gap length bug.'
                            ' See http://sourceforge.net/tracker/?func=detail&aid=604751&group_id=2171&atid=102171')  # noqa: E501
 
-        t = cdrdao.ReadTOCTask(device)
+        t = cdrdao.ReadTOCTask(device, fast_toc=True)
         runner.run(t)
         toc = t.toc.table