diff --git a/DataConnectionManagement/src/main/java/fr/soleil/data/adapter/AbstractMatrixToStringAdapter.java b/DataConnectionManagement/src/main/java/fr/soleil/data/adapter/AbstractMatrixToStringAdapter.java
index 367527041075c667a07e221eded95912fd61c41c..67582c7754d120afbf4c985c7d5f2066149e46ed 100644
--- a/DataConnectionManagement/src/main/java/fr/soleil/data/adapter/AbstractMatrixToStringAdapter.java
+++ b/DataConnectionManagement/src/main/java/fr/soleil/data/adapter/AbstractMatrixToStringAdapter.java
@@ -31,6 +31,7 @@ import fr.soleil.data.container.matrix.StringMatrix;
 import fr.soleil.data.exception.DataAdaptationException;
 import fr.soleil.data.mediator.Mediator;
 import fr.soleil.data.target.IFormatableTarget;
+import fr.soleil.lib.project.ObjectUtils;
 
 /**
  * A {@link DataToStringAdapter} that adapts some {@link Number}s to {@link String} values
@@ -84,21 +85,22 @@ public class AbstractMatrixToStringAdapter<N> extends DataToStringAdapter<Abstra
             } else if (firstType.isAssignableFrom(BigInteger.class)) {
                 result = (AbstractMatrix<N>) new BigIntegerMatrix();
             }
-
-            String[] values = data.split(COMMA);
-
+            String[] values;
+            if (data.indexOf(ObjectUtils.NEW_LINE) > -1) {
+                values = data.split(ObjectUtils.NEW_LINE);
+            } else {
+                values = data.split(COMMA);
+            }
             try {
                 result.setValue(result.initValue(1, values.length));
             } catch (UnsupportedDataTypeException e) {
                 throw new DataAdaptationException("Unexpected data conversion exception", e);
             }
-
             int index = 0;
             for (String valueToSet : values) {
                 result.setValueFromStringAt(valueToSet, 0, index);
                 index++;
             }
-
         }
         return result;
     }