diff --git a/src/GrampsDb/_GrampsDbBase.py b/src/GrampsDb/_GrampsDbBase.py
index 18e328797..e9590b302 100644
--- a/src/GrampsDb/_GrampsDbBase.py
+++ b/src/GrampsDb/_GrampsDbBase.py
@@ -1928,9 +1928,9 @@ class GrampsDbBase(GrampsDBCallback):
                         if obj.has_handle_reference(classname,handle):
                             yield (primary_table_name, found_handle)
                         
-                    data = cursor.next()
+                data = cursor.next()
                     
-                cursor.close()
+            cursor.close()
 
         return