diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx
index 3a1122d04ddbc3b4f3a3709be56d8c10938126da..09b1c377dfb0cadf6c30cb5ae2b7370a3466071f 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx
@@ -225,9 +225,9 @@ StatusCode CKF2::execute() {
     else return false;
   });
 
-  allTracks.remove_if([&](const TrackInfo &p) {
-    return (p.nMeasurements <= 12);
-  });
+  //allTracks.remove_if([&](const TrackInfo &p) {
+  // return (p.nMeasurements <= 12);
+  //});
 
   while (not allTracks.empty()) {
     TrackInfo selected = allTracks.front();
@@ -238,7 +238,7 @@ StatusCode CKF2::execute() {
     
     if(not allTracks.empty()){ 
       allTracks.remove_if([&](const TrackInfo &p) {
-        return ((p.clusterSet & selected.clusterSet).count() > 6);
+        return ((p.nMeasurements <= 12) || ((p.clusterSet & selected.clusterSet).count() > 6));
       });
     }
   }
@@ -268,7 +268,7 @@ StatusCode CKF2::execute() {
       outputTracks->push_back(std::move(trk2));
     } else {
       outputTracks->push_back(std::move(trk));
-      ATH_MSG_WARNING("Re-Fit failed.");
+      ATH_MSG_WARNING("Re-Fit either not performed or failed.");
     }
   }
 
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
index 6971ae7a47e6f41c39087a70d9ee90b5207d29cc..4d4a7125d91253a352ca1aac8fa5806936ebba53 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
@@ -356,7 +356,7 @@ KalmanFitterTool::fit(const EventContext &ctx, const Acts::GeometryContext &gctx
   }
 
 
-  // set the start position 5 mm in front of the first track measurement
+  // set the start position 10 mm in front of the first track measurement
   double origin = inputTrack->trackParameters()->front()->position().z() - 10;
 
   auto pSurface = Acts::Surface::makeShared<Acts::PlaneSurface>(