diff --git a/lisp/org-habit.el b/lisp/org-habit.el
index 1eb516080..8c0284912 100644
--- a/lisp/org-habit.el
+++ b/lisp/org-habit.el
@@ -200,15 +200,11 @@ This list represents a \"habit\" for the rest of this module."
 	     (count 0))
 	(unless reversed (goto-char end))
 	(while (and (< count maxdays)
-		    (funcall
-		     search
-		     (format "- State \"%s\".*\\[\\([^]]+\\)\\]"
-			     (concat "\\("
-				     (mapconcat 'regexp-quote
-						org-done-keywords "\\|") "\\)"))
-		     limit t))
+		    (funcall search (format "- State \"%s\".*\\[\\([^]]+\\)\\]"
+					    (regexp-opt org-done-keywords))
+			     limit t))
 	  (push (time-to-days
-		 (org-time-string-to-time (match-string-no-properties 2)))
+		 (org-time-string-to-time (match-string-no-properties 1)))
 		closed-dates)
 	  (setq count (1+ count))))
       (list scheduled sr-days deadline dr-days closed-dates))))