diff --git a/Setup/SetupStack.h b/Setup/SetupStack.h
index c50b6f4002d1e7b11841e874909038a353693f57..397f7a35fff166dbaff80f7cd1c212d61d1d6dc0 100644
--- a/Setup/SetupStack.h
+++ b/Setup/SetupStack.h
@@ -70,11 +70,12 @@ public:
   }
   void SetParticleData(
       GeometryDataInterface<T>& parent,
-      const std::tuple<const corsika::environment::BaseNodeType*>) { // v = {nullptr}) {
-    SetNode(parent.GetNode());
+      const std::tuple<const corsika::environment::BaseNodeType*>) { 
+    SetNode(parent.GetNode()); // copy Node from parent particle!
   }
   void SetParticleData() { SetNode(nullptr); }
-  void SetParticleData(GeometryDataInterface<T>& parent) { SetNode(parent.GetNode()); }
+  void SetParticleData(GeometryDataInterface<T>& parent) { SetNode(parent.GetNode());  // copy Node from parent particle!
+  }
   void SetNode(const corsika::environment::BaseNodeType* v) {
     GetStackData().SetNode(GetIndex(), v);
   }