diff --git a/corsika/detail/modules/pythia8/Interaction.inl b/corsika/detail/modules/pythia8/Interaction.inl
index 752ac96a147fbdd438fe1c78942c88d796e00bb3..9e13f4de82834de41ad14f411583169ec811a79f 100644
--- a/corsika/detail/modules/pythia8/Interaction.inl
+++ b/corsika/detail/modules/pythia8/Interaction.inl
@@ -160,7 +160,7 @@ namespace corsika::pythia8 {
     MomentumVector const& pMomentum = particle.getMomentum();
     CoordinateSystemPtr const& labCS = pMomentum.getCoordinateSystem();
 
-    Code const corsikaBeamId = particle.getPID();
+    Code corsikaBeamId = particle.getPID();
 
     // beam particles for pythia : 1, 2, 3 for p, pi, k
     // read from cross section code table
diff --git a/tests/modules/testPythia8.cpp b/tests/modules/testPythia8.cpp
index 09a7c067263bc4d30e6d477cd7f68e1231203ec1..d07c791f5a73cfeb8801597cc62d2c77091e727b 100644
--- a/tests/modules/testPythia8.cpp
+++ b/tests/modules/testPythia8.cpp
@@ -165,7 +165,7 @@ TEST_CASE("Pythia8Interface", "modules") {
         Code::Proton, 0, 0, 7_TeV, (setup::Environment::BaseNodeType* const)nodePtr,
         *csPtr);
     auto& view = *secViewPtr;
-    auto particle = stackPtr->first();
+    auto const particle = stackPtr->getNextParticle();
 
     corsika::pythia8::Interaction collision;