diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3df842298..777aaddef 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -14,6 +14,9 @@
 
 2009-10-22  John Wiegley  <jwiegley@gmail.com>
 
+	* org-habit.el (org-habit-build-graph): Fix to the graph building
+	when last DONE date is earlier than `org-habit-preceding-days'.
+
 	* org-clock.el (org-resolve-clocks-if-idle): Fix to the way idle
 	time is reported after the user comes back (but before they
 	resolve time).
diff --git a/lisp/org-habit.el b/lisp/org-habit.el
index d87b6adc7..a9ecf33c4 100644
--- a/lisp/org-habit.el
+++ b/lisp/org-habit.el
@@ -278,10 +278,10 @@ Habits are assigned colors on the following basis:
 	(graph (make-string (1+ (- (time-to-days ending)
 				   (time-to-days starting))) ?\ ))
 	(index 0))
-    (if done-dates
-	(while (time-less-p (car done-dates) starting)
-	  (setq last-done-date (car done-dates)
-		done-dates (cdr done-dates))))
+    (while (and done-dates
+		(time-less-p (car done-dates) starting))
+      (setq last-done-date (car done-dates)
+	    done-dates (cdr done-dates)))
     (while (time-less-p day ending)
       (let* ((now-days (time-to-days day))
 	     (in-the-past-p (< now-days current-days))