diff --git a/dumux/implicit/2pdfm/2pdfmlocalresidual.hh b/dumux/implicit/2pdfm/2pdfmlocalresidual.hh
index 2204ea01805c0bb62fbac72484e0d5c308c6d6e9..68c006bd84a655aae3bd884c22b5c4956a0eba9b 100644
--- a/dumux/implicit/2pdfm/2pdfmlocalresidual.hh
+++ b/dumux/implicit/2pdfm/2pdfmlocalresidual.hh
@@ -55,7 +55,7 @@ protected:
         numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
     };
     typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-    typedef Dune::UGGrid<2> GridType;
+    typedef typename GET_PROP_TYPE(TypeTag, Grid) GridType;
     typedef typename GridType::ctype DT;
     enum {
         dim = GridView::dimension,
diff --git a/dumux/implicit/2pdfm/2pdfmvolumevariables.hh b/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
index a3911de2e8a0aa60a5e35ee7d3e5c9483832344d..22605f37ea071b7f20fcba4c3e7bd71ab31409a1 100644
--- a/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
+++ b/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
@@ -67,7 +67,7 @@ class TwoPDFMVolumeVariables : public TwoPVolumeVariables<TypeTag>
 
     typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
     typedef typename GridView::template Codim<0>::Entity Element;
-    typedef Dune::UGGrid<2> GridType;
+    typedef typename GET_PROP_TYPE(TypeTag, Grid) GridType;
     typedef typename GridType::ctype DT;
     enum {
             dim = GridView::dimension,
diff --git a/test/implicit/2pdfm/2pdfmtestproblem.hh b/test/implicit/2pdfm/2pdfmtestproblem.hh
index 73bc5ad331f938d8787c02924e9206c47e9db27f..c39c2f87fbe8d591f388a8a7af10697014114534 100644
--- a/test/implicit/2pdfm/2pdfmtestproblem.hh
+++ b/test/implicit/2pdfm/2pdfmtestproblem.hh
@@ -54,6 +54,7 @@ NEW_TYPE_TAG(TwoPDFMTestProblem, INHERITS_FROM(BoxTwoPDFM, TwoPDFMSpatialParams)
 #if HAVE_UG
 SET_TYPE_PROP(TwoPDFMTestProblem, Grid, Dune::UGGrid<2>);
 #else
+#warning External grid UG needed to run this example.
 SET_TYPE_PROP(TwoPDFMTestProblem, Grid, Dune::YaspGrid<2>);
 #endif