diff --git a/LuaLibs/ProcessLapJoint.lua b/LuaLibs/ProcessLapJoint.lua
index dcdaa3e..bfcf4e4 100644
--- a/LuaLibs/ProcessLapJoint.lua
+++ b/LuaLibs/ProcessLapJoint.lua
@@ -3721,7 +3721,7 @@ local function MachineByMill( Proc, nPhase, nRawId, nPartId, b3Solid, tvtN, nBas
                EgtOutLog( sErr)
                return false, sErr
             else
-               sWarn = 'Warning : lapjoint chamfer angle machined with different tool'
+               sWarn = 'Warning : lapjoint angled face machined with different tool'
             end
          end
          -- recupero i dati dell'utensile
@@ -3732,6 +3732,15 @@ local function MachineByMill( Proc, nPhase, nRawId, nPartId, b3Solid, tvtN, nBas
                dTDiam = EgtTdbGetCurrToolParam( MCH_TP.DIAM) or dTDiam
             end
          end
+         -- se utensile troppo più grande dell'originale salto la lavorazione
+         if sTuuidPk and EgtTdbSetCurrTool( EgtTdbGetToolFromUUID( sTuuidPk) or '') then
+            local dTDiamOriginalTool = EgtTdbGetCurrToolParam( MCH_TP.DIAM) or 0
+            if dTDiam > 2 * dTDiamOriginalTool then
+               sWarn = 'Warning : lapjoint angled face skipped (no compatible tool)'
+               EgtOutLog( sWarn)
+               return true, sWarn
+            end
+         end
          -- Calcolo uso faccia
          local nFaceUse = BL.GetNearestParalOpposite( tDimAndRef[1][3]:getVersZ())
          -- inserisco la lavorazione di fresatura
diff --git a/LuaLibs/ProcessStepJointNotch.lua b/LuaLibs/ProcessStepJointNotch.lua
index a24dec6..962058a 100644
--- a/LuaLibs/ProcessStepJointNotch.lua
+++ b/LuaLibs/ProcessStepJointNotch.lua
@@ -13,6 +13,7 @@ local Fbs = require( 'FacesBySaw')
 local DC = require( 'DiceCut')
 local Cut = require( 'ProcessCut')
 local Topology = require( 'FeatureTopology')
+local LapJoint = require( 'ProcessLapJoint')
 
 EgtOutLog( ' ProcessStepJointNotch started', 1)
 
@@ -49,7 +50,7 @@ function ProcessStepJointNotch.Classify( Proc)
    -- numero delle facce
    local nFacetCnt = EgtSurfTmFacetCount( Proc.Id)
    -- gestisco solo 2 o 4 facce
-   if nFacetCnt ~= 2 and nFacetCnt ~= 4 and nFacetCnt ~= 6 and nFacetCnt ~= 8 then
+   if nFacetCnt ~= 2 and nFacetCnt ~= 3 and nFacetCnt ~= 4 and nFacetCnt ~= 6 and nFacetCnt ~= 8 then
       return false, false
    end
    -- verifico le normali delle facce
@@ -583,6 +584,9 @@ end
 ---------------------------------------------------------------------
 -- Applicazione della lavorazione
 function ProcessStepJointNotch.Make( Proc, nPhase, nRawId, nPartId, dOvmHead)
+   if Proc.Fct == 3 then
+      return LapJoint.Make( Proc, nPhase, nRawId, nPartId, dOvmHead)
+   end
    -- esecuzione eventuale smusso
    -- ottengo anche il flag che indica che la feature è larga come la trave
    local bOkc, sErrC, nDiffWidth = MakeChamfer( Proc, nPhase, nRawId, nPartId, dOvmHead)