diff --git a/AMDiS/src/parallel/ParallelDomainBase.cc b/AMDiS/src/parallel/ParallelDomainBase.cc
index 7bce38ef58d9531b212f48567938ab44dba6b99f..4d5a872f279dcb4fa266f79687dbcd83d0d601ad 100644
--- a/AMDiS/src/parallel/ParallelDomainBase.cc
+++ b/AMDiS/src/parallel/ParallelDomainBase.cc
@@ -71,12 +71,14 @@ namespace AMDiS {
     // If the problem has been already read from a file, we do not need to do anything.
     if (deserialized)
       return;
+    
 
     // Test, if the mesh is the macro mesh only! Paritioning of the mesh is supported
     // only for macro meshes, so it will not work yet if the mesh is already refined
     // in some way.
     testForMacroMesh();
 
+
     // create an initial partitioning of the mesh
     partitioner->createPartitionData();
     // set the element weights, which are 1 at the very first begin
@@ -84,6 +86,7 @@ namespace AMDiS {
     // and now partition the mesh
     partitionMesh(adaptInfo);   
 
+
 #if (DEBUG != 0)
     debug::ElementIdxToDofs elMap;
     debug::createSortedDofs(mesh, elMap);
@@ -100,6 +103,7 @@ namespace AMDiS {
     ParallelDomainDbg::testAllElements(*this);
 #endif
 
+
     // === Create interior boundary information. ===
 
     createInteriorBoundaryInfo();
@@ -108,6 +112,7 @@ namespace AMDiS {
     ParallelDomainDbg::printBoundaryInfo(*this);
 #endif
 
+
     // === Create new global and local DOF numbering. ===
 
     createLocalGlobalNumbering();
@@ -172,7 +177,6 @@ namespace AMDiS {
       }
     }
 
-
     // === Remove periodic boundary conditions in sequential problem definition. ===
 
     // Remove periodic boundaries in boundary manager on matrices and vectors.
@@ -189,7 +193,7 @@ namespace AMDiS {
 	if (probStat[i]->getSolution()->getDOFVector(j)->getBoundaryManager())
 	  removeBoundaryCondition(const_cast<BoundaryIndexMap&>(probStat[i]->getSolution()->getDOFVector(j)->getBoundaryManager()->getBoundaryConditionMap()));
 	
-	if (probStat[i]->getRhs()->getDOFVector(i)->getBoundaryManager())
+	if (probStat[i]->getRhs()->getDOFVector(j)->getBoundaryManager())
 	  removeBoundaryCondition(const_cast<BoundaryIndexMap&>(probStat[i]->getRhs()->getDOFVector(j)->getBoundaryManager()->getBoundaryConditionMap()));
       }
     }