diff --git a/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupPanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupPanelVM.vb
index 74fb09f3..714ea6b4 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupPanelVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupPanelVM.vb
@@ -672,13 +672,13 @@ Public Class Wall
    Sub New(nParentMachGroup As Core.MyMachGroup, nPartId As Integer)
       MyBase.New(nParentMachGroup, nPartId)
       ' leggo info pezzo
-      EgtGetInfo(nPartId, BTL_PRT_PROJ, nProjId)
+      EgtGetInfo(nPartId, BTL_PRT_PROJ, m_nProjId)
       EgtGetInfo(nPartId, BTL_PRT_PDN, m_nPDN)
       EgtGetInfo(nPartId, BTL_PRT_NAM, m_sNAM)
       EgtGetInfo(nPartId, BTL_PRT_L, m_dL)
       EgtGetInfo(nPartId, BTL_PRT_W, m_dW)
-      EgtGetInfo(nPartId, BTL_PRT_H, dH)
-      EgtGetInfo(nPartId, BTL_PRT_CNT, nCNT)
+      EgtGetInfo(nPartId, BTL_PRT_H, m_dH)
+      EgtGetInfo(nPartId, BTL_PRT_CNT, m_nCNT)
       Dim nTemp As Integer = 0
       If Not EgtGetInfo(nPartId, BTL_PRT_ROTATED, nTemp) Then
          nTemp = 0
@@ -704,10 +704,10 @@ Public Class Wall
          Index += 1
       End While
       If bFound Then
-         StringToDouble(sSplitInfo(1), dPOSX)
-         StringToDouble(sSplitInfo(2), dPOSY)
-         StringToDouble(sSplitInfo(3), dROT)
-         StringToDouble(sSplitInfo(4), dFLIP)
+         StringToDouble(sSplitInfo(1), m_dPOSX)
+         StringToDouble(sSplitInfo(2), m_dPOSY)
+         StringToDouble(sSplitInfo(3), m_dROT)
+         StringToDouble(sSplitInfo(4), m_dFLIP)
       End If
       ' vado sul layer delle feature
       Dim nProcessingId As Integer = EgtGetFirstNameInGroup(nPartId, PROCESSINGS)
diff --git a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
index bcbcf66e..4bf1b6c2 100644
--- a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
@@ -144,22 +144,20 @@ Public Class OpenProjectFileDialogVM
    '   Return Not IsNothing(SelProject)
    'End Function
    Friend Function VerifySelected() As Boolean
+      Dim AllFilesInDir As IEnumerable(Of String)
       If SelProject.nProjectType = Core.ConstBeam.ProjectType.PROJ Then
          ' verifico se esiste ProdId
 
-
-         For Each File In SelProject.sProjDirPath
-            If Path.GetExtension(File).ToLower() = ".nge" Then
-               Return True
-            End If
-         Next
+         AllFilesInDir = IO.Directory.EnumerateFiles(SelProject.sProjDirPath)
       ElseIf SelProject.nProjectType = Core.ConstBeam.ProjectType.PROD Then
-         For Each File In SelProject.sProdDirPath
-            If Path.GetExtension(File).ToLower() = ".nge" Then
-               Return True
-            End If
-         Next
+         AllFilesInDir = IO.Directory.EnumerateFiles(SelProject.sProdDirPath)
       End If
+      For Each File In AllFilesInDir
+         If Path.GetExtension(File).ToLower() = ".nge" Then
+            Return True
+         End If
+      Next
+
       Return False
    End Function
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
index 8718136f..0931e377 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
@@ -358,7 +358,7 @@ Public Class ProjManagerVM
          ' scrivo info proj su tutti i pezzi
          Dim nPartId = EgtGetFirstPart()
          While nPartId <> GDB_ID.NULL
-            EgtSetInfo(nPartId, BTL_PRT_PROJ, m_CurrProj.nProjId)
+            EgtSetInfo(nPartId, BTL_PRT_PROJ, nProjId)
             nPartId = EgtGetNextPart(nPartId)
          End While
          ' salvo il progetto