diff --git a/Box/Main.cpp b/Box/Main.cpp
index a1f0c4bf409e2a2ccca4f0e40391c9f748ca3da6..3db67abcdb3e72ab0fd6116ce20719dff49422be 100644
--- a/Box/Main.cpp
+++ b/Box/Main.cpp
@@ -1,4 +1,4 @@
-// $Id: Main.cpp,v 1.50 2005-06-20 16:40:25 geuzaine Exp $
+// $Id: Main.cpp,v 1.51 2005-10-24 15:38:13 geuzaine Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -86,13 +86,15 @@ int main(int argc, char *argv[])
 {
   ParUtil::Instance()->init(argc, argv);
 
+  InitSymbols();
+
+  Init_Mesh0(&M);
+
   Init_Options(0);
 
   if(argc < 2)
     Info(0, argv[0]);
 
-  Init_Mesh0(&M);
-
   // FIXME: could not make this work on IRIX
 #if !defined(__sgi__) 
   signal(SIGINT, Signal);
diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index fbc0d16fec4697fab5dc94502056e8b555edd106..cf23789aa74f36459ba657638a12fb98356e672a 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -1,4 +1,4 @@
-// $Id: CommandLine.cpp,v 1.65 2005-09-22 22:39:22 geuzaine Exp $
+// $Id: CommandLine.cpp,v 1.66 2005-10-24 15:38:13 geuzaine Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -155,10 +155,6 @@ char *Get_BuildOptions(void)
 
 void Get_Options(int argc, char *argv[])
 {
-  // This symbol context is local to option parsing (the symbols will
-  // not interfere with subsequent OpenFiles)
-  InitSymbols();
-
   // Parse session and option files
   ParseFile(CTX.session_filename_fullpath, 1, 1);
   ParseFile(CTX.options_filename_fullpath, 1, 1);
diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp
index f08e6063599c3f1a533a7175161e2a69956c9188..e2720f41b155f1daeb42b9786d4f460b618df9fd 100644
--- a/Fltk/Main.cpp
+++ b/Fltk/Main.cpp
@@ -1,4 +1,4 @@
-// $Id: Main.cpp,v 1.83 2005-08-24 20:28:43 remacle Exp $
+// $Id: Main.cpp,v 1.84 2005-10-24 15:38:13 geuzaine Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -71,6 +71,10 @@ int main(int argc, char *argv[])
     strcat(cmdline, " ");
   }
 
+  // Initialize the symbol tree that will hold variable names
+  
+  InitSymbols();
+
   // Initialize the static Mesh
   
   Init_Mesh0(&M);
diff --git a/Parser/OpenFile.cpp b/Parser/OpenFile.cpp
index 8415c828d56f9b7d0099b12d51de69ad05814034..172bee9455a7a53d5069c8281a8d03261f2a9df5 100644
--- a/Parser/OpenFile.cpp
+++ b/Parser/OpenFile.cpp
@@ -1,4 +1,4 @@
-// $Id: OpenFile.cpp,v 1.84 2005-10-15 19:06:09 geuzaine Exp $
+// $Id: OpenFile.cpp,v 1.85 2005-10-24 15:38:14 geuzaine Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -342,7 +342,6 @@ void OpenProblem(char *name)
   }
   CTX.threads_lock = 1;
 
-  InitSymbols();
   Init_Mesh(&M);
 
   // Initialize pseudo random mesh generator to the same seed