diff --git a/source/geometry/solids/specific/src/G4GenericTrap.cc b/source/geometry/solids/specific/src/G4GenericTrap.cc
index ccc3bbab54e7029d59eb8757e1350beeab16261e..d5768eaae959eb598f26c0169f25d6dff1ae4e14 100644
--- a/source/geometry/solids/specific/src/G4GenericTrap.cc
+++ b/source/geometry/solids/specific/src/G4GenericTrap.cc
@@ -807,7 +807,10 @@ G4double G4GenericTrap::DistanceToIn(const G4ThreeVector& p) const
     return fTessellatedSolid->DistanceToIn(p);
   }  
 #endif
- 
+  //MB: temporary hack to return a very conservative value of zero to avoid errors in the computation of the safety
+  //
+  return 0.;
+  //
   G4double safz = std::fabs(p.z())-fDz;
   if(safz<0) { safz=0; }
 
@@ -913,7 +916,10 @@ G4double G4GenericTrap::DistanceToOut(const G4ThreeVector& p,
     return fTessellatedSolid->DistanceToOut(p, v, calcNorm, validNorm, n);
   }
 #endif
-
+  //MB: temporary hack to return a very conservative value of zero to avoid errors in the computation of the safety
+  //  
+  return 0.;
+  //      
   G4double distmin;
   G4bool lateral_cross = false;
   ESide side = kUndef;