diff --git a/ba/ba3100.cpp b/ba/ba3100.cpp
index 5b9cd7874..62c3353d9 100755
--- a/ba/ba3100.cpp
+++ b/ba/ba3100.cpp
@@ -37,6 +37,8 @@ public:
   void print();
 };
 
+HIDDEN inline BA3100_application & app() { return (BA3100_application & ) main_app();}
+
 void BA3100_application::print()
 {
 #if XVT_OS == XVT_OS_WIN
@@ -114,9 +116,9 @@ bool BA3100_application::protected_record(TRectype& rec)
 HIDDEN bool tiporeg_handler(TMask_field& f, KEY k)
 
 {
-  if ((k == K_TAB || k == K_ENTER) &&
-      ((BA3100_application*) MainApp())->exist_journal() &&
-      atoi(f.get()) == REG_JOURNAL)
+  if ((k == K_TAB || k == K_ENTER) && app().exist_journal() &&
+      (atoi(f.get()) == REG_JOURNAL)
+      )
     return error_box("Non e' possibile avere due registri giornale nello stesso anno");
   return TRUE;
 }
@@ -126,6 +128,7 @@ bool BA3100_application::user_create()
 {
   if (argc() < 3) return FALSE;
   _tabname = argv(2);
+
   if (_tabname.empty()) return FALSE;
   _tabname.upper();
   TString16 m, t(_tabname);