diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx
index 86206601261771077c1f97c16819576fbcb16897..f0489f2d585ff4decc516087cae6961e6ad29255 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx
@@ -270,10 +270,10 @@ StatusCode CKF2::execute() {
 //  }
 
   if (m_statesWriter && !m_noDiagnostics) {
-    ATH_CHECK(m_trajectoryStatesWriterTool->write(gctx, selectedTracks, m_isMC));
+    ATH_CHECK(m_trajectoryStatesWriterTool->write(gctx, tracks, m_isMC));
   }
   if (m_summaryWriter && !m_noDiagnostics) {
-    ATH_CHECK(m_trajectorySummaryWriterTool->write(gctx, selectedTracks, m_isMC));
+    ATH_CHECK(m_trajectorySummaryWriterTool->write(gctx, tracks, m_isMC));
   }
   // ATH_CHECK(allTrackContainer.record(std::move(outputAllTracks)));
   ATH_CHECK(trackContainer.record(std::move(outputTracks)));
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
index a339e81a90dc212bf0dee9b3a9e22667ef2c32c9..380edcd19d76e544fe08ae8694e4232e68f4ea6e 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
@@ -367,6 +367,12 @@ KalmanFitterTool::fit(const EventContext &ctx, const Acts::GeometryContext &gctx
 
   auto [sourceLinks, measurements] = getMeasurementsFromTrack(inputTrack);
   auto trackParameters = getParametersFromTrack(inputTrack->trackParameters()->front(), inputVector, origin);
+  //Inflate the covariance of the starting track parameters
+  //@todo: make the inflation configurable
+  if(trackParameters.covariance().has_value()){ 
+    trackParameters.covariance() = (trackParameters.covariance().value())*10; 
+  }
+ 
   ATH_MSG_DEBUG("trackParameters: " << trackParameters.parameters().transpose());
   ATH_MSG_DEBUG("position: " << trackParameters.position(gctx).transpose());
   ATH_MSG_DEBUG("momentum: " << trackParameters.momentum().transpose());