diff --git a/FunctionSpace/BasisTest.cpp b/FunctionSpace/BasisTest.cpp
index f215d28a645d2386a22c9025edf6902c8083e36b..8f7de4f3a9aaba3601dd6ec6a48ea1f9bed519db 100644
--- a/FunctionSpace/BasisTest.cpp
+++ b/FunctionSpace/BasisTest.cpp
@@ -32,7 +32,7 @@ int basisTest(int argc, char** argv){
   writer.setDomain(goe.getAll());
 
   // Plot Basis //
-  HexNodeBasis b(1);
+  TriNodeBasis b(3);
   
   PlotBasis plot(b, goe, writer);
   plot.plot("basis");
diff --git a/FunctionSpace/FunctionSpace.cpp b/FunctionSpace/FunctionSpace.cpp
index 22024d648af570f1fbf6349267248a31d2bb4a10..dba047b801dcc0404d9b5be7b82971ac82698a84 100644
--- a/FunctionSpace/FunctionSpace.cpp
+++ b/FunctionSpace/FunctionSpace.cpp
@@ -90,7 +90,7 @@ vector<Dof> FunctionSpace::getKeys(const MElement& elem) const{
   vector<Dof> myDof(nDof);
 
   int it = 0;
-
+  
   // Add Vertex Based Dof //
   for(int i = 0; i < nFVertex; i++){
     for(int j = 0; j < nVertex; j++){
@@ -108,9 +108,9 @@ vector<Dof> FunctionSpace::getKeys(const MElement& elem) const{
   }
   /*
   // Add Face Based Dof //
-  for(int i = 0; i < nFace; i++){
-    for(int j = 0; j < nFFace; j++){
-      myDof[it].setDof(mesh->getGlobalId(face[i]), j);
+  for(int i = 0; i < nFFace; i++){
+    for(int j = 0; j < nFace; j++){
+      myDof[it].setDof(mesh->getGlobalId(face[j]), i);
       it++;
     }
   }
@@ -120,8 +120,7 @@ vector<Dof> FunctionSpace::getKeys(const MElement& elem) const{
     myDof[it].setDof(mesh->getGlobalId(element), i);
     it++;
   }
-  
-  
+
   return myDof;
 }