diff --git a/src/View/Results/PlotRKCEnsemble.py b/src/View/Results/PlotRKCEnsemble.py
index c5c87704..f5e8e190 100644
--- a/src/View/Results/PlotRKCEnsemble.py
+++ b/src/View/Results/PlotRKCEnsemble.py
@@ -160,14 +160,7 @@ class PlotRKCEnsemble(PamhyrPlot):
                 table = result.get("table")[t]
                 ts = result.get_timestamp_id(self._current_timestamp)
 
-                water_z = list(
-                    map(
-                        lambda p: table[
-                            ts, p.global_index
-                        ],
-                        reach.profiles
-                    )
-                )
+                water_z = table[ts, :]
 
                 self.water = self.canvas.axes.plot(
                     rk, water_z,
@@ -271,27 +264,12 @@ class PlotRKCEnsemble(PamhyrPlot):
         table = result.get("table")["Z"]
         ts = result.get_timestamp_id(self._current_timestamp)
 
-        water_z = list(
-            map(
-                lambda p: table[
-                    ts, p.global_index
-                ],
-                reach.profiles
-            )
-        )
+        water_z = table[ts, :]
 
         self.water[0].set_data(
             rk, water_z
         )
 
-        self.water_fill.remove()
-        self.water_fill = self.canvas.axes.fill_between(
-            rk, self._river_bottom, water_z,
-            where=[rb <= wz for rb, wz in zip(self._river_bottom, water_z)],
-            color=self.color_plot_river_water_zone,
-            alpha=0.7, interpolate=True
-        )
-
     def update_additional_data(self):
         self.draw_additional_data(0)
         self.update_idle()
diff --git a/src/View/RunSolver/Window.py b/src/View/RunSolver/Window.py
index 049eb8d6..b78b70df 100644
--- a/src/View/RunSolver/Window.py
+++ b/src/View/RunSolver/Window.py
@@ -565,7 +565,14 @@ class SolverLogEnsWindow(SolverLogWindow):
         )
 
         results.set("table", table)
-        results.set("timestamps", tables["timestamps"])
+
+        ts = tables["timestamps"]
+        ts_index = {}
+        for i, t in enumerate(sorted(ts)):
+            ts_index[t] = i
+
+        results.set("timestamps", ts)
+        results.set_timestamp_index(ts_index)
 
         return results