diff --git a/anki/cards.py b/anki/cards.py
index 3cf10cb2b..7468f80fb 100644
--- a/anki/cards.py
+++ b/anki/cards.py
@@ -99,9 +99,11 @@ class Card(object):
         self.timerStopped = time.time()
 
     def thinkingTime(self):
-        "Return the time this card's been shown."
         return (self.timerStopped or time.time()) - self.timerStarted
 
+    def totalTime(self):
+        return time.time() - self.timerStarted
+
     def css(self):
         return self.cardModel.css() + self.fact.css()
 
@@ -115,7 +117,7 @@ class Card(object):
             self.successive += 1
         else:
             self.successive = 0
-        delay = self.thinkingTime()
+        delay = self.totalTime()
         # ignore any times over 60 seconds
         if delay < 60:
             self.reviewTime += delay
diff --git a/anki/deck.py b/anki/deck.py
index 0470b1476..2defbb006 100644
--- a/anki/deck.py
+++ b/anki/deck.py
@@ -690,12 +690,12 @@ priority != 0 and due < :now and spaceUntil > :now""",
         stats['new'] = self.newCountLeftToday
         stats['failed'] = self.failedCount
         stats['successive'] = self.reviewCount
-        #stats['old'] = stats['failed'] + stats['successive']
         if stats['dAverageTime']:
             if self.newCardSpacing == NEW_CARDS_DISTRIBUTE:
                 count = stats['successive'] + stats['new']
             elif self.newCardSpacing == NEW_CARDS_LAST:
                 count = stats['successive'] or stats['new']
+            count += stats['failed']
             stats['timeLeft'] = anki.utils.fmtTimeSpan(
                 stats['dAverageTime'] * count, pad=0, point=1)
         else:
diff --git a/anki/stats.py b/anki/stats.py
index 18e9660a7..a38e59540 100644
--- a/anki/stats.py
+++ b/anki/stats.py
@@ -146,7 +146,7 @@ def updateAllStats(s, gs, ds, card, ease, oldState):
 
 def updateStats(s, stats, card, ease, oldState):
     stats.reps += 1
-    delay = card.thinkingTime()
+    delay = card.totalTime()
     if delay >= 60:
         # make a guess as to the time spent answering
         stats.reviewTime += stats.averageTime