diff --git a/Common/Options.cpp b/Common/Options.cpp
index c4a5aa073dde769a8b4fcfd60514a73b534b6eec..98585a85a22de8f4fb4800e5e37dd11d20dc7a12 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.198 2004-10-30 03:07:29 geuzaine Exp $
+// $Id: Options.cpp,v 1.199 2004-11-02 17:55:15 geuzaine Exp $
 //
 // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
 //
@@ -5299,10 +5299,11 @@ double opt_view_external_view(OPT_ARGS_NUM)
   }
 #if defined(HAVE_FLTK)
   if(_gui_action_valid(action, num)){
-    if(v->ExternalViewIndex <= -2 ||
-       v->ExternalViewIndex >= WID->view_choice[10]->size()-1)
+    if(v->ExternalViewIndex > -2 &&
+       v->ExternalViewIndex < WID->view_choice[10]->size()-1)
+      WID->view_choice[10]->value(v->ExternalViewIndex+1);
+    else if(WID->view_choice[10]->size() > 0)
       WID->view_choice[10]->value(0);
-    WID->view_choice[10]->value(v->ExternalViewIndex+1);
   }
 #endif
   return v->ExternalViewIndex;
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 631e34785790c6e963415db4db101bb1677eb16b..ee28aa203f71636faaaa233eacffcc73401e2465 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.373 2004-10-28 03:59:10 geuzaine Exp $
+// $Id: GUI.cpp,v 1.374 2004-11-02 17:55:15 geuzaine Exp $
 //
 // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
 //
@@ -2654,6 +2654,7 @@ void GUI::create_option_window()
 
         view_choice[10] = new Fl_Choice(L + 2 * WB, 2 * WB + 9 * BH, IW, BH, "Data source");
         view_choice[10]->align(FL_ALIGN_RIGHT);
+	reset_external_view_list();
 
         static Fl_Menu_Item menu_vecloc[] = {
           {"Cell centered", 0, 0, 0},
diff --git a/doc/CREDITS b/doc/CREDITS
index 1d46fa21c1dda0dde9a9bbb7a9440afe5b369a6c..50eb452ea98055e3385dc8d3077e53e2df4e14f5 100644
--- a/doc/CREDITS
+++ b/doc/CREDITS
@@ -1,4 +1,4 @@
-$Id: CREDITS,v 1.18 2004-10-25 00:45:47 geuzaine Exp $
+$Id: CREDITS,v 1.19 2004-11-02 17:55:15 geuzaine Exp $
 
              Gmsh is copyright (C) 1997-2004 
 
@@ -95,4 +95,4 @@ Jose Miguel Pasini <jmp84 at cornell.edu>, Philippe Lussou <plussou at
 necs.fr>, Jacques Kools <JKools at veeco.com>, Bayram Yenikaya
 <yenikaya at math.umn.edu>, Peter Hornby <p.hornby at arrc.csiro.au>,
 Krishna Mohan Gundu <gkmohan at gmail.com>, Chris Stott
-<C.Stott@surrey.ac.uk>.
+<C.Stott@surrey.ac.uk>, Timmy Schumacher <Tim.Schumacher@colorado.edu>.