diff --git a/src/MuDecayChannel.cc b/src/MuDecayChannel.cc
index 2653a09..038a1ea 100644
--- a/src/MuDecayChannel.cc
+++ b/src/MuDecayChannel.cc
@@ -91,10 +91,10 @@ G4DecayProducts *MuDecayChannel::DecayIt(G4double)
   if (GetVerboseLevel()>1) G4cout << "MuDecayChannel::DecayIt ";
 #endif
 
-//------------------------------modified----------xran---------------- 
-  if (G4MT_parent == 0) FillParent();  
-  if (G4MT_daughters == 0) FillDaughters();
-//------------------------------modified----------xran---------------- 
+//------------------------------Geant4.10.3-------TP------------------ 
+  if (G4MT_parent == 0)    CheckAndFillParent();  
+  if (G4MT_daughters == 0) CheckAndFillDaughters();
+//------------------------------modified----------TP------------------ 
 
   // parent mass
 //------------------------------modified----------xran----------------      
diff --git a/src/MuDecayChannelWithSpin.cc b/src/MuDecayChannelWithSpin.cc
index 2c12e17..80e6894 100644
--- a/src/MuDecayChannelWithSpin.cc
+++ b/src/MuDecayChannelWithSpin.cc
@@ -68,9 +68,9 @@ G4DecayProducts *MuDecayChannelWithSpin::DecayIt(G4double)
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) G4cout << "MuDecayChannelWithSpin::DecayIt ";
 #endif
-
-  if (G4MT_parent == 0) FillParent();  
-  if (G4MT_daughters == 0) FillDaughters();
+  // -------- Geant4.10.3 -TP-----------------------
+  if (G4MT_parent == 0)    CheckAndFillParent();  
+  if (G4MT_daughters == 0) CheckAndFillDaughters();
 
   // parent mass
   G4double parentmass = G4MT_parent->GetPDGMass();
diff --git a/src/musrPhysicsList.cc b/src/musrPhysicsList.cc
index 4e695cc..d5d71a3 100644
--- a/src/musrPhysicsList.cc
+++ b/src/musrPhysicsList.cc
@@ -527,6 +527,7 @@ void musrPhysicsList::ConstructEM()
   //del G4String myTypeOfProcesses  = musrParameters::GetInstance()->GetMyTypeOfProcesses();
   //del  G4cout<<"musrPhysicsList::ConstructEM():  myTypeOfProcesses="<<myTypeOfProcesses<<G4endl;
 
+  auto theParticleIterator=GetParticleIterator(); //Geant4.10.3
   theParticleIterator->reset();
   while( (*theParticleIterator)() ){
     G4ParticleDefinition* particle = theParticleIterator->value();
@@ -587,6 +588,7 @@ void musrPhysicsList::ConstructGeneral()  {
     G4RadioactiveDecay*  theRadioactiveDecay = new G4RadioactiveDecay();
     G4GenericIon* ion = G4GenericIon::GenericIon();
     
+    auto theParticleIterator=GetParticleIterator(); //Geant4.10.3
     theParticleIterator->reset();
     while( (*theParticleIterator)() ){
       G4ParticleDefinition* particle = theParticleIterator->value();
diff --git a/src/musrRootOutput.cc b/src/musrRootOutput.cc
index a0efcc0..96a123e 100644
--- a/src/musrRootOutput.cc
+++ b/src/musrRootOutput.cc
@@ -471,12 +471,12 @@ void musrRootOutput::EndOfRunAction() {
   for (Int_t i=0; i<maxNGeantParameters; i++) {
     TVector_GeantParametersD[i]=GeantParametersD[i];
   }
-  TVector_GeantParametersD.Write("geantParametersD");
   //
   TH1D* hGeantParameters = new TH1D("hGeantParameters","hGeantParameters",maxNGeantParameters,0.,float(maxNGeantParameters));
-  for (Int_t i=0; i<maxNGeantParameters+1; i++) {
+  TVector_GeantParametersD.Write("geantParametersD");
+  for (Int_t i=0; i<maxNGeantParameters; i++) {
     hGeantParameters->SetBinContent(i,GeantParametersD[i]);
-  }
+  } 
   hGeantParameters->Write();
   rootFile->Close();
   G4cout<<"musrRootOutput::EndOfRunAction() - Root tree written out."<<G4endl;