diff --git a/Plugin/Annotate.cpp b/Plugin/Annotate.cpp
index 392e53be27f4ac5a19792f4c201f42e196acd193..66ed436d70f0179c216bb8312c0051de63a0ff69 100644
--- a/Plugin/Annotate.cpp
+++ b/Plugin/Annotate.cpp
@@ -1,4 +1,4 @@
-// $Id: Annotate.cpp,v 1.9 2005-03-11 05:47:56 geuzaine Exp $
+// $Id: Annotate.cpp,v 1.10 2005-03-11 17:25:07 geuzaine Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -147,20 +147,32 @@ char *GMSH_AnnotatePlugin::callbackStr(int num, int action, char *value, char **
 
 double GMSH_AnnotatePlugin::callbackX(int num, int action, double value)
 {
+  // not perfect: the change will only take place if we reopen the dialog...
+  int dim3 = (int)AnnotateOptions_Number[3].def;
   return callback(num, action, value, &AnnotateOptions_Number[0].def,
-		  0.5, -100., 100000.);
+		  dim3 ? CTX.lc/200. : 0.5, 
+		  dim3 ? -CTX.lc : -100., 
+		  dim3 ? CTX.lc : 100000.);
 }
 
 double GMSH_AnnotatePlugin::callbackY(int num, int action, double value)
 {
+  // not perfect: the change will only take place if we reopen the dialog...
+  int dim3 = (int)AnnotateOptions_Number[3].def;
   return callback(num, action, value, &AnnotateOptions_Number[1].def,
-		  0.5, -100., 100000.);
+		  dim3 ? CTX.lc/200. : 0.5, 
+		  dim3 ? -CTX.lc : -100., 
+		  dim3 ? CTX.lc : 100000.);
 }
 
 double GMSH_AnnotatePlugin::callbackZ(int num, int action, double value)
 {
+  // not perfect: the change will only take place if we reopen the dialog...
+  int dim3 = (int)AnnotateOptions_Number[3].def;
   return callback(num, action, value, &AnnotateOptions_Number[2].def,
-		  0.5, -100., 100000.);
+		  dim3 ? CTX.lc/200. : 0.5, 
+		  dim3 ? -CTX.lc : -100., 
+		  dim3 ? CTX.lc : 100000.);
 }
 
 double GMSH_AnnotatePlugin::callback3D(int num, int action, double value)
diff --git a/doc/VERSIONS b/doc/VERSIONS
index d4e9d83fadb40a15d374da4caa3e6eefd60c21b3..9de5dc5a1fa92016340d119e1f31e4612c275d42 100644
--- a/doc/VERSIONS
+++ b/doc/VERSIONS
@@ -1,12 +1,12 @@
-$Id: VERSIONS,v 1.317 2005-03-11 08:56:38 geuzaine Exp $
+$Id: VERSIONS,v 1.318 2005-03-11 17:25:07 geuzaine Exp $
 
 New since 1.59: added support for discrete curves; new Window menu on
 Mac OS X; generalized all octree-based plugins (CutGrid, StreamLines,
 Probe, etc.) to handle all element types (and not only scalar and
-vector triangles+tetrahedra); generalized Plugin(Evaluate) and
-Plugin(Extract); enhanced clipping plane interface; new grid options
-for 3D post-processing views; new manipulator dialog; various small
-enhancements and bug fixes.
+vector triangles+tetrahedra); generalized Plugin(Evaluate),
+Plugin(Extract) and Plugin(Annotate); enhanced clipping plane
+interface; new grid options for 3D post-processing views; new
+manipulator dialog; various small enhancements and bug fixes.
 
 New in 1.59: added support for discrete (triangulated) surfaces,
 either in STL format or with the new "Discrete Surface" command; added