diff --git a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEFast.cc b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEFast.cc
index 4b26153cc72c1..f587621d1eb3a 100644
--- a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEFast.cc
+++ b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEFast.cc
@@ -478,8 +478,6 @@ void PixelCPEFast::errorFromTemplates(DetParam const& theDetParam,
 LocalPoint PixelCPEFast::localPosition(DetParam const& theDetParam, ClusterParam& theClusterParamBase) const {
   ClusterParamGeneric& theClusterParam = static_cast<ClusterParamGeneric&>(theClusterParamBase);
 
-  assert(!theClusterParam.with_track_angle);
-
   if (useErrorsFromTemplates_) {
     errorFromTemplates(theDetParam, theClusterParam, theClusterParam.theCluster->charge());
   } else {
diff --git a/RecoTracker/TransientTrackingRecHit/plugins/TkTransientTrackingRecHitBuilderESProducer.cc b/RecoTracker/TransientTrackingRecHit/plugins/TkTransientTrackingRecHitBuilderESProducer.cc
index 6ad6be14078a9..a570f5264bb9f 100644
--- a/RecoTracker/TransientTrackingRecHit/plugins/TkTransientTrackingRecHitBuilderESProducer.cc
+++ b/RecoTracker/TransientTrackingRecHit/plugins/TkTransientTrackingRecHitBuilderESProducer.cc
@@ -62,6 +62,12 @@ TkTransientTrackingRecHitBuilderESProducer::TkTransientTrackingRecHitBuilderESPr
     ppToken_ = c.consumes(edm::ESInputTag("", pname));
   }
 
+  if (pname == "PixelCPEFast") {
+    edm::LogWarning("TkTransientTrackingRecHitBuilderESProducer")
+        << "\n\t\t WARNING!\n 'PixelCPEFast' has been chosen as PixelCPE choice.\n"
+        << " Track angles will NOT be used in the CPE estimation!\n";
+  }
+
   auto const mname = p.getParameter<std::string>("Matcher");
   if (mname != "Fake") {
     mpToken_ = c.consumes(edm::ESInputTag("", mname));
diff --git a/RecoTracker/TransientTrackingRecHit/python/TTRHBuilders_cff.py b/RecoTracker/TransientTrackingRecHit/python/TTRHBuilders_cff.py
index 1f402fc050149..ed848c523bcc3 100644
--- a/RecoTracker/TransientTrackingRecHit/python/TTRHBuilders_cff.py
+++ b/RecoTracker/TransientTrackingRecHit/python/TTRHBuilders_cff.py
@@ -7,6 +7,7 @@
 from RecoTracker.TkSeedingLayers.TTRHBuilderWithoutAngle4PixelPairs_cfi import *
 from RecoTracker.TkSeedingLayers.TTRHBuilderWithoutAngle4PixelTriplets_cfi import *
 #TransientTRH builder with template
+from RecoLocalTracker.SiPixelRecHits.PixelCPEFastESProducer_cfi import *
 from RecoLocalTracker.SiPixelRecHits.PixelCPETemplateReco_cfi import *
 from RecoLocalTracker.SiPixelRecHits.PixelCPEClusterRepair_cfi import *
 from RecoLocalTracker.Phase2TrackerRecHits.Phase2StripCPEESProducer_cfi import *
diff --git a/RecoTracker/TransientTrackingRecHit/python/TransientTrackingRecHitBuilder_cfi.py b/RecoTracker/TransientTrackingRecHit/python/TransientTrackingRecHitBuilder_cfi.py
index 90b0fb3bacd65..66843a0f7f8f7 100644
--- a/RecoTracker/TransientTrackingRecHit/python/TransientTrackingRecHitBuilder_cfi.py
+++ b/RecoTracker/TransientTrackingRecHit/python/TransientTrackingRecHitBuilder_cfi.py
@@ -8,6 +8,9 @@
                                                             Matcher = 'StandardMatcher',
                                                             ComputeCoarseLocalPositionFromDisk = False)
 
+TTRHBuilderFast = ttrhbwr.clone(ComponentName = 'WithoutAngleFast',
+                                PixelCPE = 'PixelCPEFast')
+
 from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
 trackingPhase2PU140.toModify(ttrhbwr, 
                              Phase2StripCPE = 'Phase2StripCPE',