diff --git a/activation-api-1.1/src/main/java/javax/activation/DataHandler.java b/activation-api-1.1/src/main/java/javax/activation/DataHandler.java
index 817ef02..b4b4bcf 100644
--- a/activation-api-1.1/src/main/java/javax/activation/DataHandler.java
+++ b/activation-api-1.1/src/main/java/javax/activation/DataHandler.java
@@ -246,7 +246,7 @@
                 dch = localFactory.createDataContentHandler(mimeType);
             }
             if (dch == null) {
-                dch = CommandMap.getDefaultCommandMap().createDataContentHandler(mimeType);
+                dch = getCommandMap().createDataContentHandler(mimeType);
             }
         }
         return dch;