diff --git a/AMDiS/src/DOFVector.hh b/AMDiS/src/DOFVector.hh
index 940ecd43ec6a9cfec93e15835fb5c7244e2cf593..27af395381c0a43e570b28b81f9f8943e3c90ad7 100644
--- a/AMDiS/src/DOFVector.hh
+++ b/AMDiS/src/DOFVector.hh
@@ -368,10 +368,10 @@ namespace AMDiS {
 			     DegreeOfFreedom* dof_indices)
   {
     BasisFunction* phi = const_cast<BasisFunction*>(this->getFESpace()->getBasisFcts());
-    int numberOfBasFcts = phi->getNumber();
+    int nBasisFcts = phi->getNumber();
     T val = 0.0;
 
-    for (int i = 0; i < numberOfBasFcts; i++)
+    for (int i = 0; i < nBasisFcts; i++)
       val += (*this)[dof_indices[i]]*(*phi->getPhi(i))(lambda);
 
     return val;
@@ -490,7 +490,7 @@ namespace AMDiS {
 
     double result = 0.0;
     int nPoints = quadFast->getNumPoints();
-    std::vector<T> uh_vec(this->feSpace->getBasisFcts()->getNumber());
+    std::vector<T> uh_vec(nPoints);
     TraverseStack stack;
     ElInfo *elInfo = 
       stack.traverseFirst(mesh, -1, 
@@ -526,7 +526,7 @@ namespace AMDiS {
 
     double result = 0.0;
     int nPoints = quadFast->getNumPoints();
-    std::vector<T> uh_vec(this->feSpace->getBasisFcts()->getNumber());
+    std::vector<T> uh_vec(nPoints);
     TraverseStack stack;
     ElInfo *elInfo = 
       stack.traverseFirst(mesh, -1, 
@@ -563,11 +563,12 @@ namespace AMDiS {
     double result = 0.0;
     int nPoints = quadFast->getNumPoints();
     int dimOfWorld = Global::getGeo(WORLD);
-    std::vector<WorldVector<T> > grduh_vec(this->feSpace->getBasisFcts()->getNumber());
+    std::vector<WorldVector<T> > grduh_vec(nPoints);
     TraverseStack stack;
     ElInfo *elInfo = 
       stack.traverseFirst(mesh, -1, 
-			  Mesh::CALL_LEAF_EL | Mesh::FILL_COORDS | Mesh::FILL_DET | Mesh::FILL_GRD_LAMBDA);
+			  Mesh::CALL_LEAF_EL | Mesh::FILL_COORDS | 
+			  Mesh::FILL_DET | Mesh::FILL_GRD_LAMBDA);
     while (elInfo) {
       double det = elInfo->getDet();
       double normT = 0.0;
@@ -1077,7 +1078,7 @@ namespace AMDiS {
 
     double result = 0.0;
     int nPoints = quadFast->getNumPoints();
-    std::vector<T> uh_vec(this->feSpace->getBasisFcts()->getNumber());
+    std::vector<T> uh_vec(nPoints);
     TraverseStack stack;
     ElInfo *elInfo = 
       stack.traverseFirst(mesh, -1,