diff --git a/Reconstruction/RecGenfitAlg/src/GenfitTrack.cpp b/Reconstruction/RecGenfitAlg/src/GenfitTrack.cpp
index aea43eec01348fb7e7e057c8f2e8a07270293f0f..335becc5acaa9e01899c1975b38b78171990998c 100644
--- a/Reconstruction/RecGenfitAlg/src/GenfitTrack.cpp
+++ b/Reconstruction/RecGenfitAlg/src/GenfitTrack.cpp
@@ -162,7 +162,7 @@ bool GenfitTrack::createGenfitTrackFromMCParticle(int pidType,
 
 ///Create a Genfit track with MCParticle, unit conversion here
 bool GenfitTrack::createGenfitTrackFromEDM4HepTrack(int pidType,
-        edm4hep::ConstTrack& track, double eventStartTime)
+        edm4hep::ConstTrack track, double eventStartTime)
 {
     //std::cout<<__FILE__<<"   "<<__LINE__<<" bz kilogauss "<<m_genfitField->getBz({0.,0.,0.})/dd4hep::kilogauss<<std::endl;
     //std::cout<<__FILE__<<"   "<<__LINE__<<" bz tesla "<<m_genfitField->getBz({0.,0.,0.})/dd4hep::tesla<<std::endl;
@@ -196,7 +196,7 @@ bool GenfitTrack::createGenfitTrackFromEDM4HepTrack(int pidType,
 }
 
 /// Add a 3d SpacepointMeasurement on TrackerHit
-bool GenfitTrack::addSpacePointTrakerHit(edm4hep::ConstTrackerHit& hit,
+bool GenfitTrack::addSpacePointTrakerHit(edm4hep::ConstTrackerHit hit,
         int hitID)
 {
     edm4hep::Vector3d pos=hit.getPosition();
@@ -307,7 +307,7 @@ void GenfitTrack::addWireMeasurement(double driftDistance,
 }//end of addWireMeasurementOnTrack
 
 //Add wire measurement on wire, unit conversion here
-bool GenfitTrack::addWireMeasurementOnTrack(edm4hep::ConstTrack& track,double sigma)
+bool GenfitTrack::addWireMeasurementOnTrack(edm4hep::ConstTrack track,double sigma)
 {
     for(unsigned int iHit=0;iHit<track.trackerHits_size();iHit++){
         edm4hep::ConstTrackerHit hit=track.getTrackerHits(iHit);
@@ -644,7 +644,7 @@ double GenfitTrack::extrapolateToHit( TVector3& poca, TVector3& pocaDir,
 
 
 ///Add space point measurement from edm4hep::Track to genfit track
-int GenfitTrack::addSimTrackerHits(edm4hep::ConstTrack& track,
+int GenfitTrack::addSimTrackerHits(edm4hep::ConstTrack track,
         const edm4hep::MCRecoTrackerAssociationCollection* assoHits,
         float sigma,bool smear){
     //A TrakerHit collection
diff --git a/Reconstruction/RecGenfitAlg/src/GenfitTrack.h b/Reconstruction/RecGenfitAlg/src/GenfitTrack.h
index 678e73762da46fa91b2a8871f7c326bc9d94a2f7..d4f3dfdc5561b4b48f0365e3e6215cb867e63476 100644
--- a/Reconstruction/RecGenfitAlg/src/GenfitTrack.h
+++ b/Reconstruction/RecGenfitAlg/src/GenfitTrack.h
@@ -92,14 +92,14 @@ class GenfitTrack {
     ///Create genfit track from MCParticle
     bool createGenfitTrackFromMCParticle(int pidTyep,const edm4hep::MCParticle&
             mcParticle, double eventStartTime=0.);
-    bool createGenfitTrackFromEDM4HepTrack(int pidType, edm4hep::ConstTrack& track,
+    bool createGenfitTrackFromEDM4HepTrack(int pidType, edm4hep::ConstTrack track,
             double eventStartTime);
 
     //  /// Prepare a hit list, return number of hits on track
     //  int PrepareHits();//TODO
 
     /// Add a space point measurement, return number of hits on track
-    bool addSpacePointTrakerHit(edm4hep::ConstTrackerHit& hit, int hitID);
+    bool addSpacePointTrakerHit(edm4hep::ConstTrackerHit hit, int hitID);
 
     /// Add a space point measurement, return number of hits on track
     virtual bool addSpacePointMeasurement(const TVectorD&, double,
@@ -111,10 +111,10 @@ class GenfitTrack {
             const TVector3& endPoint2, int lrAmbig, int detID, int hitID);
 
     /// Add a WireMeasurement with DC digi
-    virtual bool addWireMeasurementOnTrack(edm4hep::ConstTrack& track, double sigma);
+    virtual bool addWireMeasurementOnTrack(edm4hep::ConstTrack track, double sigma);
 
     ///Add space point from truth to track
-    int addSimTrackerHits( edm4hep::ConstTrack& track,
+    int addSimTrackerHits( edm4hep::ConstTrack track,
         const edm4hep::MCRecoTrackerAssociationCollection* assoHits,
         float sigma,bool smear=false);// float nSigmaSelection