diff --git a/Processes/HadronicElasticModel/HadronicElasticModel.cc b/Processes/HadronicElasticModel/HadronicElasticModel.cc
index ab349a6be517ebaa95108f1ac6b27dea409b8b49..f68e3141067fb4a7b0977c464568501ec43a868e 100644
--- a/Processes/HadronicElasticModel/HadronicElasticModel.cc
+++ b/Processes/HadronicElasticModel/HadronicElasticModel.cc
@@ -91,12 +91,11 @@ namespace corsika::process::HadronicElasticModel {
 
     const auto* currentNode =
         fEnvironment.GetUniverse()->GetContainingNode(p.GetPosition());
-    const auto& mediumComposition =
-        currentNode->GetModelProperties().GetNuclearComposition();
-    const auto& components = mediumComposition.GetComponents();
+    const auto& composition = currentNode->GetModelProperties().GetNuclearComposition();
+    const auto& components = composition.GetComponents();
 
     std::vector<units::si::CrossSectionType> cross_section_of_components(
-        mediumComposition.GetComponents().size());
+        composition.GetComponents().size());
 
     auto const projectileMomentum = p.GetMomentum();
     auto const projectileMomentumSquaredNorm = projectileMomentum.squaredNorm();
@@ -109,8 +108,7 @@ namespace corsika::process::HadronicElasticModel {
       cross_section_of_components[i] = CrossSection(s);
     }
 
-    const auto targetCode =
-        currentNode->GetModelProperties().SampleTarget(cross_section_of_components, fRNG);
+    const auto targetCode = composition.SampleTarget(cross_section_of_components, fRNG);
 
     auto const targetMass = particles::GetMass(targetCode);
 
diff --git a/Processes/Sibyll/Interaction.cc b/Processes/Sibyll/Interaction.cc
index 893de4f51263b21b374d4292c9c6c18f58cbb879..5ccc1b743ce35f1e72a1ebd1e5cccba95a8d25e9 100644
--- a/Processes/Sibyll/Interaction.cc
+++ b/Processes/Sibyll/Interaction.cc
@@ -277,7 +277,7 @@ namespace corsika::process::sibyll {
             sigEla; // to avoid not used warning in array binding
       }
 
-      const auto targetCode = currentNode->GetModelProperties().SampleTarget(
+      const auto targetCode = mediumComposition.SampleTarget(
           cross_section_of_components, fRNG);
       cout << "Interaction: target selected: " << targetCode << endl;
       /*
diff --git a/Processes/Sibyll/NuclearInteraction.cc b/Processes/Sibyll/NuclearInteraction.cc
index b3602cb57198aeb57619c37476ef3050594431da..6a37363235f66c455206e16c0134a9b623cf4ff4 100644
--- a/Processes/Sibyll/NuclearInteraction.cc
+++ b/Processes/Sibyll/NuclearInteraction.cc
@@ -356,8 +356,7 @@ namespace corsika::process::sibyll {
       [[maybe_unused]] auto sigNucCopy = nNuc;   // ONLY TO AVOID COMPILER WARNINGS
     }
 
-    const auto targetCode =
-        currentNode->GetModelProperties().SampleTarget(cross_section_of_components, fRNG);
+    const auto targetCode = mediumComposition.SampleTarget(cross_section_of_components, fRNG);
     cout << "Interaction: target selected: " << targetCode << endl;
     /*
       FOR NOW: allow nuclei with A<18 or protons only.