diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 47bb68559..b6f7577ab 100644
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -76,7 +76,6 @@ using namespace std;
 #include "OCCViewer_ViewPort3d.h"
 #include "OCCViewer_Viewer3d.h"
 
-#include "GEOM_Client.hxx"
 #include "GEOM_InteractiveObject.hxx"
 
 #include "SALOME_NamingService.hxx"
@@ -116,7 +115,6 @@ using namespace std;
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 
-static GEOM_Client ShapeReader;
 static SMESHGUI *smeshGUI = 0;
 static CORBA::ORB_var _orb;
 
diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index e9dcc0ffe..9894a3075 100644
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -196,7 +196,7 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::Init(GEOM::GEOM_Gen_ptr geomEngine,
   SMESH_Mesh_i* meshServant = 0;
   try
     {
-      if (! _ShapeReader) _ShapeReader = new GEOM_Client();
+      if (! _ShapeReader) _ShapeReader = new GEOM_Client(GetContainerRef());
       ASSERT(_ShapeReader);
       
       // explore main Shape, get local TopoDS_Shapes of all subShapes
@@ -283,7 +283,7 @@ CORBA::Boolean SMESH_Gen_i::IsReadyToCompute(SMESH::SMESH_Mesh_ptr aMesh,
 
   try
     {
-      if (! _ShapeReader) _ShapeReader = new GEOM_Client();
+      if (! _ShapeReader) _ShapeReader = new GEOM_Client(GetContainerRef());
       ASSERT(_ShapeReader);
       TopoDS_Shape myMainShape  = _ShapeReader->GetShape(geom,myShape);
       TopTools_IndexedMapOfShape myIndexToShape;