diff --git a/yoko-util/src/main/java/org/apache/yoko/util/cmsf/RepIds.java b/yoko-util/src/main/java/org/apache/yoko/util/cmsf/RepIds.java
index af0ca63..1b08520 100644
--- a/yoko-util/src/main/java/org/apache/yoko/util/cmsf/RepIds.java
+++ b/yoko-util/src/main/java/org/apache/yoko/util/cmsf/RepIds.java
@@ -72,6 +72,10 @@
         if (LOGGER.isLoggable(Level.FINE))
             LOGGER.fine(String.format("Searching for class from repid \"%s\" using suffix \"%s\"", repid, suffix));
         Class<?> result = null;
+
+        //Special case IDL:omg.org/CORBA/WStringValue:1.0
+        if ("IDL:omg.org/CORBA/WStringValue:1.0".equals(repid) && "".equals(suffix)) return String.class;
+
         final String className = toClassName(query);
 
         if (LOGGER.isLoggable(Level.FINE))
@@ -99,6 +103,9 @@
         final String repid = query.repid;
         final String suffix = query.suffix;
 
+        //Special case IDL:omg.org/CORBA/WStringValue:1.0
+        if ("IDL:omg.org/CORBA/WStringValue:1.0".equals(repid) && "".equals(suffix)) return String.class.getName();
+
         String result = null;
         if (repid.startsWith("IDL:")) {
             result = idlToClassName(repid);