diff --git a/plugins/org.jkiss.dbeaver.ext.hana/src/org/jkiss/dbeaver/ext/hana/model/HANAMetaModel.java b/plugins/org.jkiss.dbeaver.ext.hana/src/org/jkiss/dbeaver/ext/hana/model/HANAMetaModel.java
index e8966936e21b082ff2a18dd310334ed365d3e06b..d6742ff7f3ef94555b7af498ecb9c86a17234044 100644
--- a/plugins/org.jkiss.dbeaver.ext.hana/src/org/jkiss/dbeaver/ext/hana/model/HANAMetaModel.java
+++ b/plugins/org.jkiss.dbeaver.ext.hana/src/org/jkiss/dbeaver/ext/hana/model/HANAMetaModel.java
@@ -113,8 +113,8 @@ public class HANAMetaModel extends GenericMetaModel
             try (JDBCPreparedStatement dbStat = session.prepareCall(
                 "CALL get_object_definition(?,?)"))
             {
-                dbStat.setString(1, sourceObject.getContainer().getName());
-                dbStat.setString(2, sourceObject.getName());
+                dbStat.setString(1, DBUtils.getQuotedIdentifier(sourceObject.getContainer()));
+                dbStat.setString(2, DBUtils.getQuotedIdentifier(sourceObject));
                 try (JDBCResultSet dbResult = dbStat.executeQuery()) {
                     StringBuilder ddl = new StringBuilder();
                     while (dbResult.nextRow()) {