diff --git a/ChangeLog b/ChangeLog
index 6d0c9a901..e24013a25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2003-11-23  Alex Roitman  <shura@alex.neuro.umn.edu>
 	* src/ChooseParents.py (ChooseParents.__init__): Revert the dialog 
 	back to being non-modal (otherwise adding new people is impossible).
+	* src/FamilyView.py: Do not pass the window to the ChooseParents class.
+	* src/WriteXML.py (write_witness): Fix the name string before writing
+	(fixes #847600).
 
 2003-11-21  Alex Roitman  <shura@alex.neuro.umn.edu>
 	* src/po/fr.po: Fix format line. 
diff --git a/src/FamilyView.py b/src/FamilyView.py
index b3c6e2d22..36bcc43bf 100644
--- a/src/FamilyView.py
+++ b/src/FamilyView.py
@@ -1100,8 +1100,7 @@ class FamilyView:
         try:
             ChooseParents.ChooseParents(self.parent.db,person,None,
                                         self.load_family,
-                                        self.parent.full_update,
-                                        self.parent.topWindow)
+                                        self.parent.full_update)
         except:
             DisplayTrace.DisplayTrace()
         
diff --git a/src/WriteXML.py b/src/WriteXML.py
index 0b574b413..5c070c90b 100644
--- a/src/WriteXML.py
+++ b/src/WriteXML.py
@@ -402,8 +402,9 @@ class XmlWriter:
                     self.g.write('  %s<comment>%s</comment>\n' % (sp,com))
                 self.g.write('%s</witness>\n' % sp)
             else:
+                nm = self.fix(w.get_value())
                 self.g.write('%s<witness>\n' % sp)
-                self.g.write('  %s<name>%s</name>\n' % (sp,w.get_value()))
+                self.g.write('  %s<name>%s</name>\n' % (sp,nm))
                 if com:
                     self.g.write('  %s<comment>%s</comment>\n' % (sp,com))
                 self.g.write('%s</witness>\n' % sp)