diff --git a/source/java/org/alfresco/repo/cmis/rest/CMISTemplateResultSet.java b/source/java/org/alfresco/repo/cmis/rest/CMISTemplateResultSet.java
index fc2c159090..1e88412617 100644
--- a/source/java/org/alfresco/repo/cmis/rest/CMISTemplateResultSet.java
+++ b/source/java/org/alfresco/repo/cmis/rest/CMISTemplateResultSet.java
@@ -231,7 +231,7 @@ public class CMISTemplateResultSet implements Serializable
             public String getColumnType(String colName)
             {
                 CMISResultSetColumn col = resultSet.getMetaData().getColumn(colName);
-                return col == null ? null : col.getPropertyType().name();
+                return col == null ? null : col.getCMISDataType().name();
             }
             
             /**
diff --git a/source/java/org/alfresco/repo/cmis/ws/DMDiscoveryServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMDiscoveryServicePort.java
index 9ad39d5f5d..43f1ef7c9a 100755
--- a/source/java/org/alfresco/repo/cmis/ws/DMDiscoveryServicePort.java
+++ b/source/java/org/alfresco/repo/cmis/ws/DMDiscoveryServicePort.java
@@ -90,7 +90,7 @@ public class DMDiscoveryServicePort extends DMAbstractServicePort implements Dis
             // for each column...
             for (CMISResultSetColumn column : columns)
             {
-                CMISDataTypeEnum type = column.getPropertyType();
+                CMISDataTypeEnum type = column.getCMISDataType();
                 if (type == CMISDataTypeEnum.BOOLEAN)
                 {
                     addBooleanProperty(properties, filter, column.getName(), values);