diff --git a/FunctionSpace/FunctionSpace.cpp b/FunctionSpace/FunctionSpace.cpp
index 13fb8ec94a4c33300dd621c4a7c8364d972fc978..44ed9547576d591dfc9d2a095337f2894c111625 100644
--- a/FunctionSpace/FunctionSpace.cpp
+++ b/FunctionSpace/FunctionSpace.cpp
@@ -3,11 +3,11 @@
 
 using namespace std;
 
-FunctionSpace::FunctionSpace(const GroupOfElement& goe, Mesh& mesh,
+FunctionSpace::FunctionSpace(const GroupOfElement& goe,
 			     int basisType, int order){
   // Save GroupOfElement & Mesh //
-  this->goe  = &goe;  
-  this->mesh = &mesh;
+  this->goe  = &goe;
+  this->mesh = &(goe.getMesh());
 
   // Get Geo Data (WARNING HOMOGENE MESH REQUIRED)//
   const MElement& element = goe.get(0);
diff --git a/FunctionSpace/FunctionSpace.h b/FunctionSpace/FunctionSpace.h
index 91bf93d3ef3417b60a2ae34882d2ad091e78ed40..fb0f30dd3e19fe7838766eca860a397ec9c145f4 100644
--- a/FunctionSpace/FunctionSpace.h
+++ b/FunctionSpace/FunctionSpace.h
@@ -26,9 +26,9 @@
 
 class FunctionSpace{
  protected:
-  Mesh* mesh;
+  const Mesh*           mesh;
   const GroupOfElement* goe;
-  const Basis* basis;
+  const Basis*          basis;
 
   int fPerVertex;
   int fPerEdge;
@@ -37,7 +37,7 @@ class FunctionSpace{
   int type;
 
  public:
-  FunctionSpace(const GroupOfElement& goe, Mesh& mesh,
+  FunctionSpace(const GroupOfElement& goe,
 		int basisType, int order);
 
   virtual ~FunctionSpace(void);