diff --git a/dumux/discretization/staggered/stencils.hh b/dumux/discretization/staggered/stencils.hh
index 0cc0b8aaf7d20d0c12468c5c57cf4c9caa068fc8..f977e8966bcec73ec56e1422ef6c7d8e8d6af4bc 100644
--- a/dumux/discretization/staggered/stencils.hh
+++ b/dumux/discretization/staggered/stencils.hh
@@ -200,7 +200,7 @@ public:
             {
                 faceStencils_[scvf.index()].update(problem, scvf);
 
-                const IndexType idx = scvf.dofIndexSelf() - numElements;
+                const IndexType idx = scvf.dofIndexSelf();
 
                 const auto& faceToCellCenterStencil = faceStencils_[scvf.index()].faceToCellCenterStencil();
                 fullFaceToCellCenterStencils[idx].insert(fullFaceToCellCenterStencils[idx].end(), faceToCellCenterStencil.begin(), faceToCellCenterStencil.end());
@@ -229,7 +229,7 @@ public:
     auto& get(const SubControlVolumeFace& scvFace) const
     {
         const IndexType numElements = problemPtr_->gridView().size(0);
-        return faceStencils_[scvFace.dofIndexSelf() - numElements];
+        return faceStencils_[scvFace.dofIndexSelf()];
     }
 
     /*!
@@ -237,10 +237,8 @@ public:
     */
     size_t fullFaceToCellCenterStencilSize(const int idx) const
     {
-//         const IndexType numElements = problemPtr_->gridView().size(0);
         assert(fullFaceToCellCenterStencils_ && "fullFaceToCellCenterStencils_ has already been called and deleted!");
-        return fullFaceToCellCenterStencils_.get()[0][idx/*-numElements*/].size();
-        // TODO: why does this not work?
+        return fullFaceToCellCenterStencils_.get()[0][idx].size();
     }
 
     /*!
@@ -248,10 +246,8 @@ public:
     */
     size_t fullfaceToFaceStencilSize(const int idx) const
     {
-//         const IndexType numElements = problemPtr_->gridView().size(0);
         assert(fullfaceToFaceStencils_ && "fullfaceToFaceStencils_ has already been called and deleted!");
-        return fullfaceToFaceStencils_.get()[0][idx/*-numElements*/].size();
-        // TODO: why does this not work?
+        return fullfaceToFaceStencils_.get()[0][idx].size();
     }
 
     /*!
diff --git a/dumux/implicit/staggered/assembler.hh b/dumux/implicit/staggered/assembler.hh
index e7a334f6e95bca9e3be940425e77dd105f268bbf..6609c9e4e2ad529d68a97ad98a37d53b90a07c25 100644
--- a/dumux/implicit/staggered/assembler.hh
+++ b/dumux/implicit/staggered/assembler.hh
@@ -160,7 +160,7 @@ private:
             for (auto&& globalJ : cellCenterToCellCenterStencil)
                 A11.addindex(globalI, globalJ);
             for (auto&& globalJ : cellCenterToFaceStencil)
-                A12.addindex(globalI, globalJ - this->gridView_().size(0));
+                A12.addindex(globalI, globalJ);
         }
         A11.endindices();
         A12.endindices();
@@ -185,7 +185,7 @@ private:
         for(const auto& stencil : fullfaceToFaceStencils)
         {
             for(auto&& globalJ : stencil)
-            A22.addindex(globalI, globalJ - this->gridView_().size(0));
+            A22.addindex(globalI, globalJ);
             ++globalI;
         }