diff --git a/FunctionSpace/FunctionSpace.cpp b/FunctionSpace/FunctionSpace.cpp
index fa53d850369c202e0dbc92dd99b9be110c31004d..90e8e07cb5a9b18cf474c30624bd2505ebd15c84 100644
--- a/FunctionSpace/FunctionSpace.cpp
+++ b/FunctionSpace/FunctionSpace.cpp
@@ -49,6 +49,9 @@ void FunctionSpace::build(GroupOfElement& goe,
   this->goe  = &goe;
   this->mesh = &(goe.getMesh());
 
+  // Orient All Elements //
+  goe.orientAllElements(basis); // NOT SEXY: TO BE REMOVED
+
   // Get Geo Data (WARNING HOMOGENE MESH REQUIRED)//
   const MElement& element = goe.get(0);
   MElement& myElement =
diff --git a/FunctionSpace/FunctionSpace.h b/FunctionSpace/FunctionSpace.h
index af745091731f71bb01cab06b37cf0a8cd99c472f..6f50b3f0f24e87a71c41a0b2050b286e10e3fa02 100644
--- a/FunctionSpace/FunctionSpace.h
+++ b/FunctionSpace/FunctionSpace.h
@@ -34,7 +34,8 @@
     the Dof%s and GroupOfDof%s related to its geometrical @em Support.
 
     @todo
-    Allow Hybrid Mesh
+    Allow Hybrid Mesh@n
+    Remove call to GroupOfElement:::orientAllElements()
 */
 
 class Mesh;