diff --git a/dune/gfe/parallel/globalp2mapper.hh b/dune/gfe/parallel/globalp2mapper.hh
index 09a35b912d2632cb621a842adb6225538356947b..3a8527ff11638c220c92b61df0d7da7fb736d980 100644
--- a/dune/gfe/parallel/globalp2mapper.hh
+++ b/dune/gfe/parallel/globalp2mapper.hh
@@ -85,8 +85,8 @@ namespace Dune {
           //int localIndex  = globalEdgeIndex.localIndex (*it->template subEntity<1>(i)) + gridView.size(2);
           int localIndex  = p2Mapper_.map(*it, 0, 0);
           int globalIndex = globalElementIndex.index(*it->template subEntity<0>(0))
-                            + globalEdgeIndex.nGlobalEntity()
-                            + globalVertexIndex.nGlobalEntity();
+                            + globalEdgeIndex.size(1)
+                            + globalVertexIndex.size(2);
 
           localGlobalMap_[localIndex]  = globalIndex;
           globalLocalMap_[globalIndex] = localIndex;
diff --git a/dune/gfe/parallel/matrixcommunicator.hh b/dune/gfe/parallel/matrixcommunicator.hh
index 7c23a364cf0b3f8d3d3cd263e0a4ee5ae60e3171..a807c167494226500e576b6a98e620a89f9bc3a7 100644
--- a/dune/gfe/parallel/matrixcommunicator.hh
+++ b/dune/gfe/parallel/matrixcommunicator.hh
@@ -102,7 +102,7 @@ public:
     // Create occupation pattern in matrix
     Dune::MatrixIndexSet occupationPattern;
 
-    occupationPattern.resize(guIndex1_.nGlobalEntity(), guIndex2_.nGlobalEntity());
+    occupationPattern.resize(localMapper1_.size(), localMapper2_.size());
 
     for (size_t k = 0; k < globalMatrixEntries.size(); ++k)
       occupationPattern.add(globalMatrixEntries[k].row, globalMatrixEntries[k].col);