diff --git a/source/java/org/alfresco/cmis/mapping/CMISMapping.java b/source/java/org/alfresco/cmis/mapping/CMISMapping.java
index b0dcf7c991..5b07333c40 100644
--- a/source/java/org/alfresco/cmis/mapping/CMISMapping.java
+++ b/source/java/org/alfresco/cmis/mapping/CMISMapping.java
@@ -355,7 +355,7 @@ public class CMISMapping implements InitializingBean
         {
             throw new AlfrescoRuntimeException("Malformed type id '" + typeId + "'; discriminator " + typeId.charAt(0) + " unknown");
         }
-        QName typeQName = QName.resolveToQName(serviceRegistry.getNamespaceService(), typeId.substring(2));
+        QName typeQName = QName.createQName(typeId.substring(2), serviceRegistry.getNamespaceService());
 
         // Construct CMIS Type Id
         return new CMISTypeId(scope, typeQName, typeId, typeQName);