diff --git a/src/tap/metadata/TAPColumn.java b/src/tap/metadata/TAPColumn.java
index aec7097556246ab60c1a7e74d248e7284deea2a1..4dbb7433f704ba11fee8bbf4672d6b65299aa075 100644
--- a/src/tap/metadata/TAPColumn.java
+++ b/src/tap/metadata/TAPColumn.java
@@ -945,7 +945,7 @@ public class TAPColumn implements DBColumn {
 	@Override
 	public DBColumn copy(final String dbName, final String adqlName, final DBTable dbTable){
 		TAPColumn copy = new TAPColumn((adqlName == null) ? this.adqlName : adqlName, datatype, description, unit, ucd, utype);
-		copy.setDBName((dbName == null) ? this.dbName : dbName);
+		copy.setDBName((dbName == null) ? this.getDBName() : dbName);
 		copy.setTable(dbTable);
 
 		copy.setIndexed(indexed);
diff --git a/src/tap/metadata/TAPTable.java b/src/tap/metadata/TAPTable.java
index c89df9ce892083b8003b7f46cbcaa4b97d6d0727..02a24027388125c2bfda39483f4d0be583f1c79e 100644
--- a/src/tap/metadata/TAPTable.java
+++ b/src/tap/metadata/TAPTable.java
@@ -1060,7 +1060,7 @@ public class TAPTable implements DBTable {
 	@Override
 	public DBTable copy(final String dbName, final String adqlName){
 		TAPTable copy = new TAPTable((adqlName == null) ? this.adqlName : adqlName);
-		copy.setDBName((dbName == null) ? this.dbName : dbName);
+		copy.setDBName((dbName == null) ? this.getDBName() : dbName);
 		copy.setSchema(schema);
 		Collection<TAPColumn> collColumns = columns.values();
 		for(TAPColumn col : collColumns)