diff --git a/StrategyLibs/BLADETOWASTE.lua b/StrategyLibs/BLADETOWASTE.lua
index c45a7f5..1b647de 100644
--- a/StrategyLibs/BLADETOWASTE.lua
+++ b/StrategyLibs/BLADETOWASTE.lua
@@ -392,7 +392,7 @@ local function GetSingleCutStrategy( Proc, Part, OptionalParameters)
    nToolIndex, sChosenBladeType = GetBestBlade( Proc, Part, FaceToMachine, OptionalParametersGetBestBlade)
 
    -- se possibile, upgrade del taglio tipo 'Top' a taglio a ghigliottina
-   if sChosenBladeType == 'Top' and bReduceBladePath and FaceData.IsFaceRectangular( Proc, FaceToMachine.id) then
+   if ( sChosenBladeType == 'Top' or not nToolIndex) and bReduceBladePath and FaceData.IsFaceRectangular( Proc, FaceToMachine.id) then
       -- ricerca lama migliore testa sopra
       local ToolInfo = MachiningLib.FindBlade( Proc, {
          vtN = FaceToMachine.vtN,
@@ -402,7 +402,7 @@ local function GetSingleCutStrategy( Proc, Part, OptionalParameters)
 
       -- test fattibilità taglio a ghigliottina
       if ToolInfo.nToolIndex then
-         local dRadialOffset = FaceByBlade.GetRadialOffsetForGuillotine( nToolIndex, EdgeToMachineList.TopGuillotine.dLength)
+         local dRadialOffset = FaceByBlade.GetRadialOffsetForGuillotine( ToolInfo.nToolIndex, EdgeToMachineList.TopGuillotine.dLength)
 
          if ( TOOLS[ToolInfo.nToolIndex].dMaxMaterial - EdgeToMachineList.TopGuillotine.dElevation - BeamData.CUT_SIC) > dRadialOffset + 10 * GEO.EPS_SMALL then
             nToolIndex = ToolInfo.nToolIndex
diff --git a/StrategyLibs/FACEBYBLADE.lua b/StrategyLibs/FACEBYBLADE.lua
index 5bf85b4..769c6b4 100644
--- a/StrategyLibs/FACEBYBLADE.lua
+++ b/StrategyLibs/FACEBYBLADE.lua
@@ -412,7 +412,7 @@ function FACEBYBLADE.Make( Proc, Part, FaceToMachine, EdgeToMachine, OptionalPar
          Cutting.dRadialOffsetGuillotine = FACEBYBLADE.GetRadialOffsetForGuillotine( nToolIndex, EdgeToMachine.dLength)
          if Cutting.dMaxRadialOffset > 10 * GEO.EPS_SMALL then
             -- taglio a ghigliottina
-            if bIsTopBlade and ( OppositeToolDirectionMode ~= 'Enabled') and ( Cutting.dRadialOffsetGuillotine < Cutting.dMaxRadialOffset - 10 * GEO.EPS_SMALL) then
+            if bIsTopBlade and ( Cutting.dRadialOffsetGuillotine < Cutting.dMaxRadialOffset - 10 * GEO.EPS_SMALL) then
                dDepthToMachine = Cutting.dDepthToMachine + Cutting.dRadialOffsetGuillotine
                Cutting.sCutType = 'Guillotine'
             -- taglio ridotto