diff --git a/dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationHandler.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationHandler.java
index 0f2f7f6ec..3095c03a9 100644
--- a/dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationHandler.java
+++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationHandler.java
@@ -67,8 +67,8 @@ public final class DynawoSimulationHandler extends AbstractExecutionHandler<Dyna
     private final ReportNode reportNode;
 
     private final List<TimelineEvent> timeline = new ArrayList<>();
-    private final Map<String, DoubleTimeSeries> curves = new HashMap<>();
-    private final Map<String, Double> fsv = new HashMap<>();
+    private final Map<String, DoubleTimeSeries> curves = new LinkedHashMap<>();
+    private final Map<String, Double> fsv = new LinkedHashMap<>();
     private DynamicSimulationResult.Status status = DynamicSimulationResult.Status.SUCCESS;
     private String statusText = "";