diff --git a/checkin_notes b/checkin_notes
index 7ee1072cd0..a81777e8ff 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -8667,3 +8667,12 @@ Rom    8 Dec 2010
         vm.cpp, .h
     win_build/
         vboxwrapper.vcproj
+
+David  7 Dec 2010
+    - client: fix scheduling bug when a job has fraction_done = 1
+        but it's not finished yet.
+        ACTIVE_TASK::est_dur() was returning 0
+        when it should have returned elapsed_time.
+
+    client/
+        work_fetch.cpp
diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp
index 6c7ed0c571..f189685984 100644
--- a/client/work_fetch.cpp
+++ b/client/work_fetch.cpp
@@ -1375,7 +1375,7 @@ double RESULT::estimated_time_remaining() {
 // 2) the current elapsed time and fraction done (dynamic estimate)
 //
 double ACTIVE_TASK::est_dur() {
-    if (fraction_done >= 1) return 0;
+    if (fraction_done >= 1) return elapsed_time;
     double wu_est = result->estimated_duration();
     if (fraction_done <= 0) return wu_est;
     if (wu_est < elapsed_time) wu_est = elapsed_time;