diff --git a/scripts-available/CDB_ColumnNames.sql b/scripts-available/CDB_ColumnNames.sql
index 51e0244..ebaf0b7 100644
--- a/scripts-available/CDB_ColumnNames.sql
+++ b/scripts-available/CDB_ColumnNames.sql
@@ -7,7 +7,7 @@ AS $$
       FROM information_schema.columns c, pg_class _tn, pg_namespace _sn
       WHERE table_name = _tn.relname
         AND table_schema = _sn.nspname
-        AND _tn.oid = $1::regclass::oid
+        AND _tn.oid = $1::oid
         AND _sn.oid = _tn.relnamespace;
          
 $$ LANGUAGE SQL;
diff --git a/scripts-available/CDB_ColumnType.sql b/scripts-available/CDB_ColumnType.sql
index 7793c0b..8ddc36b 100644
--- a/scripts-available/CDB_ColumnType.sql
+++ b/scripts-available/CDB_ColumnType.sql
@@ -8,7 +8,7 @@ AS $$
       WHERE table_name = _tn.relname
         AND table_schema = _sn.nspname
         AND column_name = $2
-        AND _tn.oid = $1::regclass::oid
+        AND _tn.oid = $1::oid
         AND _sn.oid = _tn.relnamespace;
          
 $$ LANGUAGE SQL;