diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
index 02f6b06a27..e3f36cae00 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
@@ -2658,7 +2658,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
 				"WHERE ((c.relname = '" + tableName.toLowerCase() + "') " +
 				" AND (c.oid = x.indrelid) " +
 				" AND (i.oid = x.indexrelid) " +
-				" AND (c.relam = a.oid)) " +
+				" AND (i.relam = a.oid)) " +
 				"ORDER BY x.indisunique DESC, " +
 				" x.indisclustered, a.amname, i.relname");  
     while (r.next()) {
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
index a17e9e1d84..749c2ba83c 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
@@ -2656,7 +2656,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
 				"WHERE ((c.relname = '" + tableName.toLowerCase() + "') " +
 				" AND (c.oid = x.indrelid) " +
 				" AND (i.oid = x.indexrelid) " +
-				" AND (c.relam = a.oid)) " +
+				" AND (i.relam = a.oid)) " +
 				"ORDER BY x.indisunique DESC, " +
 				" x.indisclustered, a.amname, i.relname");  
     while (r.next()) {