diff --git a/Common/Views.cpp b/Common/Views.cpp
index dc3bc6f26a01178cfc0a393ab39d99a92126e867..d6a1b7cf810b70cb5839f6e0aee8ff2f04ab2799 100644
--- a/Common/Views.cpp
+++ b/Common/Views.cpp
@@ -1,4 +1,4 @@
-// $Id: Views.cpp,v 1.85 2003-01-23 20:19:17 geuzaine Exp $
+// $Id: Views.cpp,v 1.86 2003-02-05 02:05:21 geuzaine Exp $
 //
 // Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
 //
@@ -1270,7 +1270,7 @@ void MergeViews(int all){
       merge(v->SY,vm->SY); vm->NbSY += v->NbSY;
       merge(v->VY,vm->VY); vm->NbVY += v->NbVY;
       merge(v->TY,vm->TY); vm->NbTY += v->NbTY;
-      /* this more complicted: have to change the indices
+      /* this more complicated: have to change the indices
 	 merge(v->T2D,vm->T2D);
 	 merge(v->T2C,vm->T2C); v->NbT2 += vm->NbT2;
 	 merge(v->T3D,vm->T3D);
diff --git a/TODO b/TODO
index 92cb819970d44a0ccb0d1558b1e49c7762919bff..c42943246fbde4caff03664b1ed199abe5100c89 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,23 @@
-$Id: TODO,v 1.8 2003-01-29 17:36:55 geuzaine Exp $
+$Id: TODO,v 1.9 2003-02-05 02:05:21 geuzaine Exp $
+
+=================================================================================
+
+* Combine view + save view with != nb of time steps
+
+gmsh tutorial/view*.pos
+View->Combine->All
+save merged view as ascii view
+
+The resulting view is corrupted. This is due to the fact that
+ascii/binary views do not support different number of time steps per
+element type (here, we have e.g. 5 time steps for ST and only 1 for
+SS), and the merge routine just adds everything instead of just the
+values up to MIN(NbTimeStep for all merged views).
+
+-> need to make merge() more intelligent. First pass on NbTimeStep,
+then List_Add() only up to common TimeStep value.
+
+=================================================================================
 
 * Two-field plots <nicolas.moes@ec-nantes.fr>