diff --git a/ChangeLog b/ChangeLog
index 7aa4e3ed9..9241f253d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-26  Don Allingham  <don@gramps-project.org>
+
+	* src/DisplayModels/_PeopleModel.py (PeopleModel._build_search_sub): 
+	switch back to old format for handling cursor until bug can be resolved
+
 2007-03-26  Zsolt Foldvari  <zfoldvar@users.sourceforge.net>
 	* src/Editors/_EditNote.py (save): pass the handle to the callback
 	instead of the object itself.
diff --git a/src/DisplayModels/_PeopleModel.py b/src/DisplayModels/_PeopleModel.py
index bf2d2cc95..84555e799 100644
--- a/src/DisplayModels/_PeopleModel.py
+++ b/src/DisplayModels/_PeopleModel.py
@@ -322,11 +322,11 @@ class PeopleModel(gtk.GenericTreeModel):
 
         self.mapper.clear_sort_names()
 
-        #cursor = self.db.get_person_cursor()
-        #node = cursor.first()
+        cursor = self.db.get_person_cursor()
+        node = cursor.first()
 
-        #while node:
-        for node in self.db.get_person_cursor_iter():
+        while node:
+        #for node in self.db.get_person_cursor_iter():
             handle, d = node
             if not (handle in skip or (dfilter and not dfilter.match(handle))):
                 name_data = d[PeopleModel._NAME_COL]
@@ -335,8 +335,8 @@ class PeopleModel(gtk.GenericTreeModel):
                 sorted_name = nsn(name_data)
 
                 self.mapper.assign_sort_name(handle, sorted_name, group_name)
-            #node = cursor.next()
-        #cursor.close()
+            node = cursor.next()
+        cursor.close()
 
     def _build_filter_sub(self,dfilter, skip):