diff --git a/src/interfaces/jdbc/CHANGELOG b/src/interfaces/jdbc/CHANGELOG
index 347cce5f94..4a5d3cd659 100644
--- a/src/interfaces/jdbc/CHANGELOG
+++ b/src/interfaces/jdbc/CHANGELOG
@@ -1,3 +1,6 @@
+Thu Jul 20 16:30:00 BST 2000 petermount@it.maidstone.gov.uk
+	- Fixed DatabaseMetaData.getTableTypes()
+
 Tue Jun 06 12:00:00 BST 2000 petermount@it.maidstone.gov.uk
 	- Added org/postgresql/DriverClass.java to the list of files removed
 	  by make clean (it's dynamically built)
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
index babc4fa03e..73d01db73c 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
@@ -1787,9 +1787,9 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
   {
     Field f[] = new Field[1];
     Vector v = new Vector();
-    byte[][] tuple = new byte[1][0];
     f[0] = new Field(connection,new String("TABLE_TYPE"),iVarcharOid,32);
     for(int i=0;i<getTableTypes.length;i++) {
+      byte[][] tuple = new byte[1][0];
       tuple[0] = getTableTypes[i][0].getBytes();
       v.addElement(tuple);
     }
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
index 7f46c1cf7e..bd19b6427a 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
@@ -1787,9 +1787,9 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
   {
     Field f[] = new Field[1];
     Vector v = new Vector();
-    byte[][] tuple = new byte[1][0];
     f[0] = new Field(connection,new String("TABLE_TYPE"),iVarcharOid,32);
     for(int i=0;i<getTableTypes.length;i++) {
+      byte[][] tuple = new byte[2][0];
       tuple[0] = getTableTypes[i][0].getBytes();
       v.addElement(tuple);
     }