diff --git a/src/PartBunch/PartBunch.hpp b/src/PartBunch/PartBunch.hpp
index 0efa58f6521b4f6857deb89dff4fa4ff7ebb8a6e..41de9eb2b33e320c2f40329d230adc755021c857 100644
--- a/src/PartBunch/PartBunch.hpp
+++ b/src/PartBunch/PartBunch.hpp
@@ -43,7 +43,6 @@ diagnostics(): calculate statistics and maybe write tp h5 and stat files
 
 #include "Algorithms/BoostMatrix.h"
 #include "Algorithms/CoordinateSystemTrafo.h"
-//#include "Algorithms/DistributionMoments.h"
 #include "Attributes/Attributes.h"
 #include "Distribution/Distribution.h"
 #include "Manager/BaseManager.h"
@@ -110,10 +109,6 @@ private:
     double rmsDensity_m;
 
 
-    std::shared_ptr<Distribution> OPALdist_m;
-
-    std::shared_ptr<FieldSolverCmd> OPALFieldSolver_m;
-
 public:
     Vector_t<int, Dim> nr_m;
 
@@ -202,6 +197,11 @@ private:
 
     /// if multiple TRACK commands
     long long globalTrackStep_m;
+
+
+    std::shared_ptr<Distribution> OPALdist_m;
+
+    std::shared_ptr<FieldSolverCmd> OPALFieldSolver_m;
     
     // unit state of PartBunch
     // UnitState_t unit_state_m;