diff --git a/include/applicat.cpp b/include/applicat.cpp
index 6e77f2cbb..853868a6b 100755
--- a/include/applicat.cpp
+++ b/include/applicat.cpp
@@ -333,8 +333,8 @@ void TApplication::terminate()
 #if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_NT
     const word WM_WAKEUP = RegisterWindowMessage("WAKEUP");
     const HTASK ht = GetCurrentTask();
-    SendMessage(HWND_BROADCAST, WM_WAKEUP, (WPARAM)ht, 0L);
-
+//    SendMessage(HWND_BROADCAST, WM_WAKEUP, (WPARAM)ht, 0L);
+    PostMessage(HWND_BROADCAST, WM_WAKEUP, (WPARAM)ht, 0L);
     if (fexist("prassi.hlp"))
     {
       HWND hwnd = (HWND)xvt_vobj_get_attr(TASK_WIN, ATTR_NATIVE_WINDOW);
diff --git a/include/relapp.cpp b/include/relapp.cpp
index 1b1c7b56b..6f7790bca 100755
--- a/include/relapp.cpp
+++ b/include/relapp.cpp
@@ -1036,7 +1036,7 @@ bool TRelation_application::parse_command_line()
   {
     ini = argv(i);
     ini.upper();
-    if (ini.left(2) == "-F" || ini.left(2) == "/F")
+    if (ini.left(2) == "-I" || ini.left(2) == "/I")
     {
       _ini = ini.mid(2);
       break;
@@ -1049,6 +1049,15 @@ bool TRelation_application::parse_command_line()
     TConfig cnf(_ini, "Transaction");
     _transaction = cnf.get("Action");
     _transaction.upper();
+    
+    long firm = cnf.get_long("Firm");
+    if (firm > 0)    
+    {
+      bool ok = set_firm(firm);
+      _mask->on_firm_change();
+      if (!ok) 
+        error_box("Ditta inesistente: %ld", firm);
+    }
   }
   return _lnflag;
 }