diff --git a/InnerDetector/InDetRecTools/PixelToTPIDTool/CMakeLists.txt b/InnerDetector/InDetRecTools/PixelToTPIDTool/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..74707c2ff3757a82c9b99f4f231d85ed8a2fe156
--- /dev/null
+++ b/InnerDetector/InDetRecTools/PixelToTPIDTool/CMakeLists.txt
@@ -0,0 +1,49 @@
+################################################################################
+# Package: PixelToTPIDTool
+################################################################################
+
+# Declare the package name:
+atlas_subdir( PixelToTPIDTool )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Control/AthenaBaseComps
+                          Control/AthenaKernel
+                          Control/StoreGate
+                          GaudiKernel
+                          Tracking/TrkEvent/TrkEventPrimitives
+                          PRIVATE
+                          Database/AthenaPOOL/AthenaPoolUtilities
+                          Database/RegistrationServices
+                          DetectorDescription/Identifier
+                          Event/EventInfo
+                          InnerDetector/InDetConditions/PixelConditionsServices
+                          InnerDetector/InDetDetDescr/InDetIdentifier
+                          InnerDetector/InDetDetDescr/PixelGeoModel
+                          InnerDetector/InDetRecEvent/InDetRIO_OnTrack
+                          Reconstruction/Particle
+                          Tools/PathResolver
+                          Tracking/TrkDetDescr/TrkSurfaces
+                          Tracking/TrkEvent/TrkMeasurementBase
+                          Tracking/TrkEvent/TrkParameters
+                          Tracking/TrkEvent/TrkRIO_OnTrack
+                          Tracking/TrkEvent/TrkTrack
+                          Tracking/TrkEvent/TrkTrackSummary
+                          Tracking/TrkTools/TrkToolInterfaces )
+
+# External dependencies:
+find_package( CLHEP )
+find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
+find_package( ROOT COMPONENTS MathCore Core Tree Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_component( PixelToTPIDTool
+                     src/*.cxx
+                     src/components/*.cxx
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests GaudiKernel TrkEventPrimitives AthenaPoolUtilities Identifier EventInfo InDetIdentifier InDetRIO_OnTrack Particle PathResolver TrkSurfaces TrkMeasurementBase TrkParameters TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkToolInterfaces )
+
+# Install files from the package:
+atlas_install_headers( PixelToTPIDTool )
+atlas_install_runtime( share/*.txt )
+
diff --git a/InnerDetector/InDetRecTools/PixelToTPIDTool/PixelToTPIDTool/PixelToTPIDTool.h b/InnerDetector/InDetRecTools/PixelToTPIDTool/PixelToTPIDTool/PixelToTPIDTool.h
index d0179da00defb966d223ec5a9906d8e9ba6cc3fa..a04167b1b1aa4691eca810df3965664212a2d0cb 100644
--- a/InnerDetector/InDetRecTools/PixelToTPIDTool/PixelToTPIDTool/PixelToTPIDTool.h
+++ b/InnerDetector/InDetRecTools/PixelToTPIDTool/PixelToTPIDTool/PixelToTPIDTool.h
@@ -63,7 +63,7 @@ namespace InDet
 
     private:
       ServiceHandle<IBLParameterSvc> m_IBLParameterSvc;
-      int                                  m_overflowIBLToT;                                                                                          
+      mutable int                    m_overflowIBLToT;                                                                                          
       ServiceHandle<IPixelOfflineCalibSvc> m_offlineCalibSvc;
       StatusCode update( IOVSVC_CALLBACK_ARGS );  
       dEdxID *m_mydedx;
diff --git a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/PixelToTPIDTool.cxx b/InnerDetector/InDetRecTools/PixelToTPIDTool/src/PixelToTPIDTool.cxx
index 1e140cbf83b14ba202789a60b6d3bcd844e4eeb3..026c7cab7b50a24358690fb7b8da8eca69fe5015 100644
--- a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/PixelToTPIDTool.cxx
+++ b/InnerDetector/InDetRecTools/PixelToTPIDTool/src/PixelToTPIDTool.cxx
@@ -130,7 +130,7 @@ StatusCode InDet::PixelToTPIDTool::initialize()
       ATH_MSG_INFO("Retrieved service " << m_IBLParameterSvc); 
  
 
-  m_overflowIBLToT = m_offlineCalibSvc->getIBLToToverflow();
+  //m_overflowIBLToT = m_offlineCalibSvc->getIBLToToverflow();
 
   ATH_MSG_INFO ("initialize() successful in " << name());
   return StatusCode::SUCCESS;
@@ -249,6 +249,7 @@ float InDet::PixelToTPIDTool::dEdx(const Trk::Track& track)
 	  
 	  //loop over ToT and check if anyone is overflow (ToT==14) check for IBL cluster overflow
 	  
+	  m_overflowIBLToT = m_offlineCalibSvc->getIBLToToverflow();
 	  const std::vector<int>& ToTs = pixclus->prepRawData()->totList();
 	  
 	    for (int pixToT : ToTs) {