diff --git a/ChangeLog b/ChangeLog
index 7fa629d8fd..a45a34befb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,12 @@
 	  columns.  Enable viewing the "taxable" entry.  Enable viewing
 	  all the tax accounts individually (fixes bug #102892)
 
+	* src/business/business-core/gw-business-core-spec.scm:
+	  wrap gncEntryGetInvTaxTable()
+	  wrap gncEntryGetBillTaxTable()
+	* src/business/business-reports/invoice.scm: only set the "taxable"
+	  value to 'T' if the value is true AND we've got an actual tax table.
+	
 2003-01-11  David Hampton  <hampton@employees.org>
 
 	* src/app-utils/gnc-ui-util.c: The "reverse balance" preference
diff --git a/src/business/business-core/gw-business-core-spec.scm b/src/business/business-core/gw-business-core-spec.scm
index 19446a74bc..0d00b7a05a 100644
--- a/src/business/business-core/gw-business-core-spec.scm
+++ b/src/business/business-core/gw-business-core-spec.scm
@@ -427,6 +427,14 @@
    '((<gnc:GncEntry*> entry))
    "Return the Entry's Taxable value")
 
+  (gw:wrap-function
+   ws
+   'gnc:entry-get-inv-tax-table
+   '<gnc:GncTaxTable*>
+   "gncEntryGetInvTaxTable"
+   '((<gnc:GncEntry*> entry))
+   "Return the Entry's Invoice Tax Table")
+
   (gw:wrap-function
    ws
    'gnc:entry-get-bill-taxable
@@ -435,6 +443,14 @@
    '((<gnc:GncEntry*> entry))
    "Return the Entry's Taxable value")
 
+  (gw:wrap-function
+   ws
+   'gnc:entry-get-bill-tax-table
+   '<gnc:GncTaxTable*>
+   "gncEntryGetBillTaxTable"
+   '((<gnc:GncEntry*> entry))
+   "Return the Entry's Bill Tax Table")
+
   (gw:wrap-function
    ws
    'gnc:entry-get-value
diff --git a/src/business/business-reports/invoice.scm b/src/business/business-reports/invoice.scm
index fa407a018e..6673c037a8 100644
--- a/src/business/business-reports/invoice.scm
+++ b/src/business/business-reports/invoice.scm
@@ -186,8 +186,10 @@
     (if (tax-col column-vector)
 	(addto! row-contents
 		(if (if invoice?
-			(gnc:entry-get-inv-taxable entry)
-			(gnc:entry-get-bill-taxable entry))
+			(and (gnc:entry-get-inv-taxable entry)
+			     (gnc:entry-get-inv-tax-table entry))
+			(and (gnc:entry-get-bill-taxable entry)
+			     (gnc:entry-get-bill-tax-table entry)))
 		    (_ "T") "")))
 
     (if (taxvalue-col column-vector)