diff --git a/ChangeLog b/ChangeLog
index 235e642b04..cfccbe9072 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-28  Derek Atkins  <derek@ihtfp.com>
+
+	* src/business/business-core/gncTaxTable.c: when asking for
+	  the child, return ourself if we're already a child instead
+	  of making a (useless) grandchild.
+	
 2003-05-28  Christian Stimming  <stimming@tuhh.de>
 
 	* src/import-export/hbci/gnc-hbci-transfer.c, dialog-hbcitrans.c,
diff --git a/src/business/business-core/gncTaxTable.c b/src/business/business-core/gncTaxTable.c
index e40c68b780..80ca4b4b1b 100644
--- a/src/business/business-core/gncTaxTable.c
+++ b/src/business/business-core/gncTaxTable.c
@@ -451,6 +451,7 @@ GncTaxTable *gncTaxTableReturnChild (GncTaxTable *table, gboolean make_new)
 
   if (!table) return NULL;
   if (table->child) return table->child;
+  if (table->parent) return table;
   if (make_new) {
     child = gncTaxTableCopy (table);
     gncTaxTableSetChild (table, child);