diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index cbaf28c7..7e80bd39 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>3</ApplicationRevision>
+    <ApplicationRevision>4</ApplicationRevision>
     <ApplicationVersion>7.2.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/ENI2/Excel/DakosyUtil.cs b/ENI2/Excel/DakosyUtil.cs
index cf0b01e8..3552a131 100644
--- a/ENI2/Excel/DakosyUtil.cs
+++ b/ENI2/Excel/DakosyUtil.cs
@@ -764,11 +764,9 @@ namespace ENI2.Excel
                 result = true;
             }
 
-            if(pasdMessage.Elements.Count >= 12)
-            {
-                foreach (PASD pasd in pasdMessage.Elements.Cast<PASD>())
-                    pasd.NotificationPAX = true;
-            }
+            bool mustPAX = pasdMessage.Elements.Count >= 12;            
+            foreach (PASD pasd in pasdMessage.Elements.Cast<PASD>())
+                pasd.NotificationPAX = mustPAX;            
 
             return result;
         }
@@ -823,11 +821,10 @@ namespace ENI2.Excel
                 result = true;
             }
 
-            if (pasMessage.Elements.Count >= 12)
-            {
-                foreach (PAS pasa in pasMessage.Elements.Cast<PAS>())
-                    pasa.NotificationPAX = true;
-            }
+            bool mustPAX = pasMessage.Elements.Count >= 12;
+            foreach (PAS pasa in pasMessage.Elements.Cast<PAS>())
+                pasa.NotificationPAX = mustPAX;
+            
 
             return result;
         }
diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs
index e6c2df49..e0667d86 100644
--- a/ENI2/Excel/ExcelUtil.cs
+++ b/ENI2/Excel/ExcelUtil.cs
@@ -2370,11 +2370,10 @@ namespace ENI2.Excel
                     Util.UIHelper.SetBusyState(); // dialog might reset busy state
                 }
 
-                if(newPasList.Count >= 12)
-                {
-                    foreach (PAS pas in newPasList)
-                        pas.NotificationPAX = true;
-                }
+                bool mustPAX = newPasList.Count >= 12;
+                foreach (PAS pasa in newPasList.Cast<PAS>())
+                    pasa.NotificationPAX = mustPAX;
+
             }
             else
             {
@@ -2507,12 +2506,10 @@ namespace ENI2.Excel
                     Util.UIHelper.SetBusyState(); // dialog might reset busy state
                 }
 
-                if (newPasList.Count >= 12)
-                {
-                    foreach (PASD pasd in newPasList.Cast<PASD>())
-                        pasd.NotificationPAX = true;
-                }
-
+                bool mustPAX = newPasList.Count >= 12;
+                foreach (PASD pasd in newPasList.Cast<PASD>())
+                    pasd.NotificationPAX = mustPAX;
+                
             }          
 
             DBManager.Instance.DeleteAllPASForMessage(pasMessage.Id);