diff --git a/src/SMESHDS/SMESHDS_GroupOnGeom.cxx b/src/SMESHDS/SMESHDS_GroupOnGeom.cxx
index 73e1654db..5fae9fda2 100644
--- a/src/SMESHDS/SMESHDS_GroupOnGeom.cxx
+++ b/src/SMESHDS/SMESHDS_GroupOnGeom.cxx
@@ -22,7 +22,6 @@
 //  SMESH SMESHDS : idl implementation based on 'SMESH' unit's classes
 //  File   : SMESHDS_GroupOnGeom.cxx
 //  Module : SMESH
-//  $Header$
 //
 #include "SMESHDS_GroupOnGeom.hxx"
 #include "SMESHDS_Mesh.hxx"
@@ -40,10 +39,16 @@ SMESHDS_GroupOnGeom::SMESHDS_GroupOnGeom (const int                 theID,
                                           const SMESHDS_Mesh*       theMesh,
                                           const SMDSAbs_ElementType theType,
                                           const TopoDS_Shape&       theShape)
-     : SMESHDS_GroupBase(theID,theMesh,theType), myShape(theShape)
+     : SMESHDS_GroupBase(theID,theMesh,theType)
 {
-  SMESHDS_Mesh* aMesh = const_cast<SMESHDS_Mesh*>(theMesh);
+  SetShape( theShape );
+}
+
+void SMESHDS_GroupOnGeom::SetShape( const TopoDS_Shape& theShape)
+{
+  SMESHDS_Mesh* aMesh = const_cast<SMESHDS_Mesh*>( GetMesh() );
   mySubMesh = aMesh->MeshElements( aMesh->AddCompoundSubmesh( theShape ));
+  myShape   = theShape;
 }
 
 // =====================
diff --git a/src/SMESHDS/SMESHDS_GroupOnGeom.hxx b/src/SMESHDS/SMESHDS_GroupOnGeom.hxx
index a1fa3cb26..ed01df758 100644
--- a/src/SMESHDS/SMESHDS_GroupOnGeom.hxx
+++ b/src/SMESHDS/SMESHDS_GroupOnGeom.hxx
@@ -22,7 +22,6 @@
 //  SMESH SMESHDS : management of mesh data and SMESH document
 //  File   : SMESHDS_GroupOnGeom.hxx
 //  Module : SMESH
-//  $Header$
 //
 #ifndef _SMESHDS_GroupOnGeom_HeaderFile
 #define _SMESHDS_GroupOnGeom_HeaderFile
@@ -43,6 +42,8 @@ class SMESHDS_EXPORT SMESHDS_GroupOnGeom: public SMESHDS_GroupBase
                        const SMDSAbs_ElementType theType,
                        const TopoDS_Shape&       theShape);
 
+  void SetShape( const TopoDS_Shape& theShape);
+
   TopoDS_Shape GetShape() const { return myShape; }
 
   virtual bool Contains (const int theID);