diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/ArrayConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/ArrayConverter.java
index 7665f3f..415e4c3 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/ArrayConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/ArrayConverter.java
@@ -51,7 +51,7 @@
                 elements =
                     fromChildren( lookup, configuration, type, enclosingType, loader, evaluator, listener, elementType );
             }
-            else if ( value instanceof String && ( "".equals( value ) || !value.equals( configuration.getValue() ) ) )
+            else if ( value instanceof String )
             {
                 final PlexusConfiguration xml = csvToXml( configuration, (String) value );
                 elements = fromChildren( lookup, xml, type, enclosingType, loader, evaluator, listener, elementType );
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/CollectionConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/CollectionConverter.java
index 06ef87f..852b78c 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/CollectionConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/CollectionConverter.java
@@ -67,7 +67,7 @@
                 elements =
                     fromChildren( lookup, configuration, type, enclosingType, loader, evaluator, listener, elementType );
             }
-            else if ( value instanceof String && ( "".equals( value ) || !value.equals( configuration.getValue() ) ) )
+            else if ( value instanceof String )
             {
                 final PlexusConfiguration xml = csvToXml( configuration, (String) value );
                 elements = fromChildren( lookup, xml, type, enclosingType, loader, evaluator, listener, elementType );
