diff --git a/CI/physmon/reference/trackrefitting_gsf/performance_trackrefitting.root b/CI/physmon/reference/trackrefitting_gsf/performance_trackrefitting.root
index b6b8d6fd126..c5f9a598b51 100644
Binary files a/CI/physmon/reference/trackrefitting_gsf/performance_trackrefitting.root and b/CI/physmon/reference/trackrefitting_gsf/performance_trackrefitting.root differ
diff --git a/CI/physmon/reference/trackrefitting_kf/performance_trackrefitting.root b/CI/physmon/reference/trackrefitting_kf/performance_trackrefitting.root
index 99385589d48..381a92cf567 100644
Binary files a/CI/physmon/reference/trackrefitting_kf/performance_trackrefitting.root and b/CI/physmon/reference/trackrefitting_kf/performance_trackrefitting.root differ
diff --git a/Examples/Io/Root/src/RootTrackSummaryWriter.cpp b/Examples/Io/Root/src/RootTrackSummaryWriter.cpp
index de6753ce3bf..46b56e4acb0 100644
--- a/Examples/Io/Root/src/RootTrackSummaryWriter.cpp
+++ b/Examples/Io/Root/src/RootTrackSummaryWriter.cpp
@@ -407,9 +407,9 @@ ProcessCode RootTrackSummaryWriter::writeT(const AlgorithmContext& ctx,
         param[i] = parameter[i];
       }
 
-      const auto& covariance = track.covariance();
       for (unsigned int i = 0; i < Acts::eBoundSize; ++i) {
-        error[i] = std::sqrt(covariance(i, i));
+        double variance = getCov(i, i);
+        error[i] = variance >= 0 ? std::sqrt(variance) : NaNfloat;
       }
     }
 
diff --git a/Examples/Python/tests/root_file_hashes.txt b/Examples/Python/tests/root_file_hashes.txt
index d52195e4008..3b7f485720f 100644
--- a/Examples/Python/tests/root_file_hashes.txt
+++ b/Examples/Python/tests/root_file_hashes.txt
@@ -75,9 +75,9 @@ test_exatrkx[gpu-onnx]__performance_track_finding.root: 9090de10ffb1489d3f1993e2
 test_exatrkx[gpu-torch]__performance_track_finding.root: 6b658fa22c7532e082eaab7aa4b71b852f1c324adcc59d1156aff45124b222d9
 test_ML_Ambiguity_Solver__performance_finding_ambiML.root: 166dd8bb189097c4957b7b02c04c41267868d72d9a08c4bb892985b06849cb76
 test_refitting[generic]__trackstates_gsf_refit.root: 462b749ba0df395e1ca0e7d6f104077d3ca4c1297d7aadf5ca2b5bbc282bb617
-test_refitting[generic]__tracksummary_gsf_refit.root: 94fad00ab0aa9f380a85135f89a81cc2e8761ab402d821a8af854e381f4982fc
+test_refitting[generic]__tracksummary_gsf_refit.root: 5c9d2ccaf10597d716c771f04d692c437204469abed84bdff5c800c89e648625
 test_refitting[odd]__trackstates_gsf_refit.root: e297749dc1e7eda3b8dea13defa0499986c584740d93e723a901b498b8e90c71
-test_refitting[odd]__tracksummary_gsf_refit.root: d5085882e45a0b699194dff9f40a36e9291227bf65f9aaaf9087f9242ef5ae22
+test_refitting[odd]__tracksummary_gsf_refit.root: cb905ac442be45f8c139f6903264dda480a91f273daba6bd92b49ad62d9e35f4
 test_truth_tracking_kalman[generic-0.0]__trackstates_kf.root: eba0b055e4f8e3e30dae2e27ef662f213fe4fc9a5c9ed00e44adb86e7219e068
 test_truth_tracking_kalman[generic-0.0]__tracksummary_kf.root: 94fad00ab0aa9f380a85135f89a81cc2e8761ab402d821a8af854e381f4982fc
 test_truth_tracking_kalman[generic-1000.0]__trackstates_kf.root: 85d397a24d5546d580bd5c69fa60655d78db7392915ed67343717e99885f97d9
diff --git a/Examples/Scripts/Python/truth_tracking_gsf_refitting.py b/Examples/Scripts/Python/truth_tracking_gsf_refitting.py
index 79bd5c41b50..1cf0d1b7d95 100755
--- a/Examples/Scripts/Python/truth_tracking_gsf_refitting.py
+++ b/Examples/Scripts/Python/truth_tracking_gsf_refitting.py
@@ -76,7 +76,7 @@ def runRefittingGsf(
     s.addWriter(
         acts.examples.RootTrackSummaryWriter(
             level=acts.logging.INFO,
-            inputTracks="tracks",
+            inputTracks="gsf_refit_tracks",
             inputParticles="particles_selected",
             inputTrackParticleMatching="refit_track_particle_matching",
             filePath=str(outputDir / "tracksummary_gsf_refit.root"),
@@ -86,9 +86,9 @@ def runRefittingGsf(
     s.addWriter(
         acts.examples.TrackFitterPerformanceWriter(
             level=acts.logging.INFO,
-            inputTracks="tracks",
+            inputTracks="gsf_refit_tracks",
             inputParticles="particles_selected",
-            inputTrackParticleMatching="track_particle_matching",
+            inputTrackParticleMatching="refit_track_particle_matching",
             filePath=str(outputDir / "performance_gsf_refit.root"),
         )
     )
diff --git a/Examples/Scripts/Python/truth_tracking_kalman_refitting.py b/Examples/Scripts/Python/truth_tracking_kalman_refitting.py
index 2d84808a15c..02f3623f510 100755
--- a/Examples/Scripts/Python/truth_tracking_kalman_refitting.py
+++ b/Examples/Scripts/Python/truth_tracking_kalman_refitting.py
@@ -73,7 +73,7 @@ def runRefittingKf(
     s.addWriter(
         acts.examples.RootTrackSummaryWriter(
             level=acts.logging.INFO,
-            inputTracks="tracks",
+            inputTracks="kf_refit_tracks",
             inputParticles="particles_selected",
             inputTrackParticleMatching="refit_track_particle_matching",
             filePath=str(outputDir / "tracksummary_kf_refit.root"),
@@ -83,9 +83,9 @@ def runRefittingKf(
     s.addWriter(
         acts.examples.TrackFitterPerformanceWriter(
             level=acts.logging.INFO,
-            inputTracks="tracks",
+            inputTracks="kf_refit_tracks",
             inputParticles="particles_selected",
-            inputTrackParticleMatching="track_particle_matching",
+            inputTrackParticleMatching="refit_track_particle_matching",
             filePath=str(outputDir / "performance_kf_refit.root"),
         )
     )