diff --git a/Reconstruction/eflowRec/src/PFOChargedCreatorAlgorithm.cxx b/Reconstruction/eflowRec/src/PFOChargedCreatorAlgorithm.cxx
index a4783f0ddbf27078c034367aaad1a37d2f27923d..6b80675316782e56967eed1214cd3ccdf87a6ef9 100644
--- a/Reconstruction/eflowRec/src/PFOChargedCreatorAlgorithm.cxx
+++ b/Reconstruction/eflowRec/src/PFOChargedCreatorAlgorithm.cxx
@@ -120,7 +120,8 @@ void PFOChargedCreatorAlgorithm::createChargedPFO(const eflowCaloObject& energyF
       for (auto trackClusterLink : trackClusterLinks){
 	eflowRecCluster* efRecCluster = trackClusterLink->getCluster();
 	ElementLink<xAOD::CaloClusterContainer> theOriginalClusterLink = efRecCluster->getOriginalClusElementLink();
-	bool isSet = thisPFO->addClusterLink(theOriginalClusterLink);
+	ElementLink<xAOD::CaloClusterContainer> theSisterClusterLink = (*theOriginalClusterLink)->getSisterClusterLink();
+	bool isSet = thisPFO->addClusterLink(theSisterClusterLink);
 	 if (!isSet) ATH_MSG_WARNING("Could not set Cluster in PFO");
       }//track-cluster link loop
     }//addClusters is set to true - so we added the clusters to the xAOD::PFO   
diff --git a/Reconstruction/eflowRec/src/PFONeutralCreatorAlgorithm.cxx b/Reconstruction/eflowRec/src/PFONeutralCreatorAlgorithm.cxx
index 45b5a574f0a81ab69240246760bdc7acbfdd44fb..95ac4dbd0a6a7c693c8223d894c87ceae2efb4bb 100644
--- a/Reconstruction/eflowRec/src/PFONeutralCreatorAlgorithm.cxx
+++ b/Reconstruction/eflowRec/src/PFONeutralCreatorAlgorithm.cxx
@@ -69,7 +69,8 @@ void PFONeutralCreatorAlgorithm::createNeutralPFO(const eflowCaloObject& energyF
     }
 
     ElementLink<xAOD::CaloClusterContainer> theOriginalClusterLink = thisEfRecCluster->getOriginalClusElementLink();
-    bool isSet = thisPFO->setClusterLink(theOriginalClusterLink);
+    ElementLink<xAOD::CaloClusterContainer> theSisterClusterLink = (*theOriginalClusterLink)->getSisterClusterLink();
+    bool isSet = thisPFO->setClusterLink(theSisterClusterLink);
     if (!isSet) { msg(MSG::WARNING) << "Could not set Cluster in PFO " << endmsg; }
 
     const xAOD::CaloCluster* cluster = thisEfRecCluster->getCluster();