diff --git a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/CombinedMuonTrackBuilder.cxx b/Reconstruction/MuonIdentification/MuidTrackBuilder/src/CombinedMuonTrackBuilder.cxx
index 869461627e6baf21031540d765bb9c784aa62f21..c24e648be48dd698ec794f21ff58279b9482f5b3 100755
--- a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/CombinedMuonTrackBuilder.cxx
+++ b/Reconstruction/MuonIdentification/MuidTrackBuilder/src/CombinedMuonTrackBuilder.cxx
@@ -56,7 +56,7 @@ CombinedMuonTrackBuilder::CombinedMuonTrackBuilder (const std::string&type,
     :	AthAlgTool			(type, name, parent),
 	m_caloEnergyParam		("Rec::MuidCaloEnergyTool/MuidCaloEnergyToolParam", this),
 	m_caloTSOS			("Rec::MuidCaloTrackStateOnSurface/MuidCaloTrackStateOnSurface", this),
-	m_cleaner			("Muon::MuonTrackCleaner/MuidTrackCleaner"), // Note: making this private crashes
+	m_cleaner			("Muon::MuonTrackCleaner/MuidTrackCleaner", this),
 	m_cscRotCreator			("", this),
 	m_extrapolator			("Trk::Extrapolator/AtlasExtrapolator", this),
 	m_fitter			("Trk::iPatFitter/iPatFitter", this),
@@ -73,7 +73,7 @@ CombinedMuonTrackBuilder::CombinedMuonTrackBuilder (const std::string&type,
 	m_printer			("Muon::MuonEDMPrinterTool/MuonEDMPrinterTool", this),
 	m_trackingGeometrySvc		("TrackingGeometrySvc/AtlasTrackingGeometrySvc",name),
 	m_trackingVolumesSvc		("TrackingVolumesSvc/TrackingVolumesSvc",name),
-	m_trackQuery			("Rec::MuonTrackQuery/MuonTrackQuery"), // Note: making this private crashes
+	m_trackQuery			("Rec::MuonTrackQuery/MuonTrackQuery", this),
 	m_trackSummary			("Trk::TrackSummaryTool/MuidTrackSummaryTool", this),
 	m_materialUpdator               ("Trk::TrkMaterialProviderTool/TrkMaterialProviderTool", this),
 	m_allowCleanerVeto		(true),
diff --git a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
index 93ba014ef2dee8999feef53db0b71c46cf7d397e..ced4da30d7559c338e7174e45fd71bebbc816cd2 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
@@ -429,9 +429,9 @@ def MuonTrackQueryCfg(flags, name="MuonTrackQuery", **kwargs ):
     from MuonConfig.MuonRIO_OnTrackCreatorConfig import MdtDriftCircleOnTrackCreatorCfg
     result = MdtDriftCircleOnTrackCreatorCfg(flags)
     kwargs.setdefault("MdtRotCreator",   result.popPrivateTools() )
-    
-    acc = CombinedMuonTrackBuilderCfg(flags)
-    kwargs.setdefault("Fitter",          acc.popPrivateTools() )
+
+    acc = iPatFitterCfg(flags)
+    kwargs.setdefault("Fitter", acc.popPrivateTools() )
     result.merge(acc)
 
     tool = CompFactory.Rec__MuonTrackQuery(name,**kwargs)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedFitTools.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedFitTools.py
index 005c51c85a299f2dfccf567f4ab419d7ee8f2baf..4d7046c88fcc7980a8a290c9acef8055886e3d9c 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedFitTools.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedFitTools.py
@@ -165,13 +165,7 @@ def MuonCombinedPropagator( name='MuonCombinedPropagator', **kwargs ):
 
 def MuonTrackQuery( name="MuonTrackQuery", **kwargs ):
      kwargs.setdefault("MdtRotCreator",   getPublicTool("MdtDriftCircleOnTrackCreator") )
-     if TriggerFlags.MuonSlice.doTrigMuonConfig:
-         trigTrackBuilder = getPublicToolClone("TrigCombinedMuonTrackBuilder","CombinedMuonTrackBuilder",
-                                              TrackSummaryTool=getPublicTool("MuonTrackSummaryTool"))
-         kwargs.setdefault("Fitter", trigTrackBuilder)
-     else:
-         kwargs.setdefault("Fitter",          getPublicTool("CombinedMuonTrackBuilder") )
-
+     kwargs.setdefault("Fitter", getPublicTool("iPatFitter"))
      return CfgMgr.Rec__MuonTrackQuery(name,**kwargs)
 
 def MuidSegmentRegionRecoveryTool( name ='MuidSegmentRegionRecoveryTool', **kwargs ):
@@ -222,6 +216,8 @@ def CombinedMuonTrackBuilderFit( name='CombinedMuonTrackBuilderFit', **kwargs ):
     kwargs.setdefault("Vertex3DSigmaZ"                , 60.*mm)
     kwargs.setdefault("UseCaloTG"                     , False )
     kwargs.setdefault("CaloMaterialProvider"          , getPublicTool("MuonMaterialProviderTool"))
+    kwargs.setdefault("Cleaner"                       , getPrivateTool("MuidTrackCleaner") )
+    kwargs.setdefault("TrackQuery"                    , getPrivateTool("MuonTrackQuery") )
 
     if TriggerFlags.MuonSlice.doTrigMuonConfig:
         kwargs.setdefault("MuonHoleRecovery"              , "" )
@@ -278,6 +274,8 @@ def CombinedMuonTrackBuilder( name='CombinedMuonTrackBuilder', **kwargs ):
     kwargs.setdefault("Vertex3DSigmaZ"                , 60.*mm)
     kwargs.setdefault("UseCaloTG"                     , True ) #
     kwargs.setdefault("CaloMaterialProvider"          , getPublicTool("MuonMaterialProviderTool"))
+    kwargs.setdefault("Cleaner"                       , getPrivateTool("MuidTrackCleaner") )
+    kwargs.setdefault("TrackQuery"                    , getPrivateTool("MuonTrackQuery") )
 
     if TriggerFlags.MuonSlice.doTrigMuonConfig:
         kwargs.setdefault("MuonHoleRecovery"              , "" )
diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
index 675a50b33cbc3f43671cd806f92f28e6d75c15c5..8dc1c2d9a56841c86e67ca132e1ca66a3573d417 100755
--- a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
@@ -233,7 +233,7 @@ def TMEF_CombinedMuonTrackBuilder(name='TMEF_CombinedMuonTrackBuilder',**kwargs)
 
 def TMEF_MuonTrackQuery(name='TMEF_MuonTrackQuery',**kwargs):
     kwargs.setdefault("MdtRotCreator","MdtDriftCircleOnTrackCreator")
-    kwargs.setdefault("Fitter", 'TMEF_CombinedMuonTrackBuilder')
+    kwargs.setdefault("Fitter", 'TMEF_iPatFitter')
     return CfgMgr.Rec__MuonTrackQuery(name,**kwargs)