diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 923dc33..90ebcb9 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.8.2.2")> 
-<Assembly: AssemblyFileVersion("1.8.2.2")> 
+<Assembly: AssemblyVersion("1.8.2.3")> 
+<Assembly: AssemblyFileVersion("1.8.2.3")> 
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
index 6a5b22a..1922bd5 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
@@ -128,6 +128,7 @@ Namespace EgtCAM5
                      EgtDraw()
                   ElseIf IsValidMachiningType(SelectedOperation.m_Type) Then
                      ' Leggo il tipo di operazione per impostare il tipo di selezione
+                     EgtSetCurrMachining(SelectedOperation.m_Id)
                      Dim OperationType As Integer = -1
                      EgtGetMachiningParam(MCH_MP.TYPE, OperationType)
                      ' Abilito la selezione delle lavorazioni
@@ -680,8 +681,9 @@ Namespace EgtCAM5
       ''' Execute the Point.  This method is invoked by the PointCommand.
       ''' </summary>
       Public Sub Update()
-         ' Recupero fase corrente
+         ' Recupero fase corrente e lavorazione corrente
          Dim nCurrPhase As Integer = EgtGetCurrPhase()
+         Dim nCurrMach As Integer = EgtGetCurrMachining()
          ' Ricalcolo la lavorazione per tutte le operazioni della lista
          For Each Operation In OperationList
             If Operation.Type = MCH_OY.DISP Then
@@ -694,8 +696,13 @@ Namespace EgtCAM5
                End If
             End If
          Next
-         ' Ripristino la fase inizialmente corrente
+         ' Ripristino la fase inizialmente corrente e pure la lavorazione
          EgtSetCurrPhase(nCurrPhase)
+         If nCurrMach <> GDB_ID.NULL Then
+            EgtSetCurrMachining(nCurrMach)
+         Else
+            EgtResetCurrMachining()
+         End If
          EgtDraw()
       End Sub
 
diff --git a/ToolsDbWindow/ToolTreeView.vb b/ToolsDbWindow/ToolTreeView.vb
index 8c4ce48..9a92705 100644
--- a/ToolsDbWindow/ToolTreeView.vb
+++ b/ToolsDbWindow/ToolTreeView.vb
@@ -1177,7 +1177,8 @@ Public Class ToolTreeViewItem
    Friend Function SaveToolDraw() As Boolean
       If m_Type = MCH_TY.DRILL_STD Or m_Type = MCH_TY.DRILL_LONG Or
          m_Type = MCH_TY.SAW_STD Or m_Type = MCH_TY.SAW_FLAT Or
-         m_Type = MCH_TY.MILL_STD Or m_Type = MCH_TY.MILL_NOTIP Then
+         m_Type = MCH_TY.MILL_STD Or m_Type = MCH_TY.MILL_NOTIP Or
+         m_Type = MCH_TY.CHISEL_STD Then
          ' nome e direttorio del file da salvare
          EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
          Dim sDrawName As String = Uuid