diff --git a/dumux/discretization/cellcentered/mpfa/interactionvolumedatahandle.hh b/dumux/discretization/cellcentered/mpfa/interactionvolumedatahandle.hh
index 7a41428485d51205c0db03158f21ed971346ac07..025154b7f9a042f990e029b7d2a61ddc6c731482 100644
--- a/dumux/discretization/cellcentered/mpfa/interactionvolumedatahandle.hh
+++ b/dumux/discretization/cellcentered/mpfa/interactionvolumedatahandle.hh
@@ -203,7 +203,8 @@ public:
         {
             for (unsigned int cIdx = 0; cIdx < numComponents; ++cIdx)
             {
-                if (pIdx == cIdx)
+                using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
+                if (cIdx == FluidSystem::getMainComponent(pIdx))
                     continue;
 
                 // resize transmissibility matrix & mole fraction vector