diff --git a/src/net/sourceforge/schemaspy/model/Table.java b/src/net/sourceforge/schemaspy/model/Table.java
index 231d4ab..d67c12b 100755
--- a/src/net/sourceforge/schemaspy/model/Table.java
+++ b/src/net/sourceforge/schemaspy/model/Table.java
@@ -183,9 +183,10 @@ private void initColumnAutoUpdate(Database db, boolean forceQuotes) throws SQLEx
             sql.append('.');
         }
         
-        if (forceQuotes)
-            sql.append("\"" + getName() + "\"");
-        else
+        if (forceQuotes) {
+            String quote = db.getMetaData().getIdentifierQuoteString().trim();
+            sql.append(quote + getName() + quote);
+        } else
             sql.append(db.getQuotedIdentifier(getName()));
         
         sql.append(" where 0 = 1");
@@ -597,9 +598,10 @@ protected int fetchNumRows(Database db, String clause, boolean forceQuotes) thro
             sql.append('.');
         }
 
-        if (forceQuotes)
-            sql.append("\"" + getName() + "\"");
-        else
+        if (forceQuotes) {
+            String quote = db.getMetaData().getIdentifierQuoteString().trim();
+            sql.append(quote + getName() + quote);
+        } else
             sql.append(db.getQuotedIdentifier(getName()));
 
         try {