diff --git a/Graphics/Geom.cpp b/Graphics/Geom.cpp
index 3c2a33b1f2869a6535b54c001f10bd1058af0781..c5a6e389d642ae224dcceaa5a831ddfcc8232464 100644
--- a/Graphics/Geom.cpp
+++ b/Graphics/Geom.cpp
@@ -1,4 +1,4 @@
-// $Id: Geom.cpp,v 1.119 2006-08-28 02:56:27 geuzaine Exp $
+// $Id: Geom.cpp,v 1.120 2006-08-28 04:03:54 geuzaine Exp $
 //
 // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 //
@@ -445,15 +445,15 @@ void Draw_Geom()
     glColor4ubv((GLubyte *) & CTX.color.axes);
     glLineWidth(CTX.line_width);
     gl2psLineWidth(CTX.line_width * CTX.print.eps_line_width_factor);
-    if(CTX.axes_auto_position){
+    if(!CTX.axes_auto_position){
+      Draw_Axes(CTX.axes, CTX.axes_tics, CTX.axes_format, CTX.axes_label, 
+		CTX.axes_position);
+    }
+    else if(geometryExists){
       double bb[6] = {CTX.min[0], CTX.max[0], CTX.min[1], 
 		      CTX.max[1], CTX.min[2], CTX.max[2]};
       Draw_Axes(CTX.axes, CTX.axes_tics, CTX.axes_format, CTX.axes_label, bb);
     }
-    else{
-      Draw_Axes(CTX.axes, CTX.axes_tics, CTX.axes_format, CTX.axes_label, 
-		CTX.axes_position);
-    }
   }
 
   if(CTX.draw_rotation_center){