diff --git a/InnerDetector/InDetConfig/python/InDetRecToolConfig.py b/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
index 45b097ae3a97b4cdab545a7d25b9e030a3a8f086..d14bcad6591e00433935ae495335dd24516ab261 100644
--- a/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
+++ b/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
@@ -23,14 +23,10 @@ def InDetTrackSummaryHelperToolCfg(flags, name='InDetTrackSummaryHelperTool', **
   result.addPublicTool(CompFactory.InDet.InDetTrackSummaryHelperTool(name, **kwargs), primary=True)
   return result
 
-def InDetTrackHoleSearchToolCfg(flags, name = 'InDetHoleSearchTool', **kwargs):
+def InDetBoundaryCheckToolCfg(flags, name='InDetBoundaryCheckTool', **kwargs):
   result = ComponentAccumulator()
-  if 'Extrapolator' not in kwargs:
-    tmpAcc =  InDetExtrapolatorCfg(flags)
-    kwargs.setdefault("Extrapolator", tmpAcc.getPrimary())
-    result.merge(tmpAcc)
 
-  if ('SctSummaryTool' not in kwargs):
+  if 'SctSummaryTool' not in kwargs:
     if flags.Detector.SCTOn:
       tmpAcc = InDetSCT_ConditionsSummaryToolCfg(flags)
       kwargs.setdefault("SctSummaryTool", tmpAcc.popPrivateTools())
@@ -43,11 +39,29 @@ def InDetTrackHoleSearchToolCfg(flags, name = 'InDetHoleSearchTool', **kwargs):
     kwargs.setdefault("PixelLayerTool", tmpAcc.getPrimary())
     result.merge(tmpAcc)
 
+  kwargs.setdefault("UsePixel", flags.Detector.PixelOn)
+  kwargs.setdefault("UseSCT", flags.Detector.SCTOn)
+
+  indet_boundary_check_tool = CompFactory.InDet.InDetBoundaryCheckTool(name, **kwargs)
+  result.setPrivateTools(indet_boundary_check_tool)
+  return result
+
+
+def InDetTrackHoleSearchToolCfg(flags, name = 'InDetHoleSearchTool', **kwargs):
+  result = ComponentAccumulator()
+  if 'Extrapolator' not in kwargs:
+    tmpAcc =  InDetExtrapolatorCfg(flags)
+    kwargs.setdefault("Extrapolator", tmpAcc.getPrimary())
+    result.merge(tmpAcc)
+
+  if 'BoundaryCheckTool' not in kwargs:
+    tmpAcc = InDetBoundaryCheckToolCfg(flags)
+    kwargs.setdefault('BoundaryCheckTool', tmpAcc.popPrivateTools())
+    result.merge(tmpAcc)
+
   if flags.Beam.Type == "cosmics" :
     kwargs.setdefault("Cosmics", True)
 
-  kwargs.setdefault( "usePixel"                     , flags.Detector.PixelOn)
-  kwargs.setdefault( "useSCT"                       , flags.Detector.SCTOn)
   kwargs.setdefault( "CountDeadModulesAfterLastHit" , True)
 
   indet_hole_search_tool = CompFactory.InDet.InDetTrackHoleSearchTool(name, **kwargs)