diff --git a/opm/autodiff/DuneMatrix.hpp b/opm/autodiff/DuneMatrix.hpp
index d603c1596..d0ba04006 100644
--- a/opm/autodiff/DuneMatrix.hpp
+++ b/opm/autodiff/DuneMatrix.hpp
@@ -39,8 +39,7 @@
 namespace Opm
 {
 
-    template <class B>
-    class DuneMatrix : public Dune::BCRSMatrix<B>
+    class DuneMatrix : public Dune::BCRSMatrix< Dune::FieldMatrix<double, 1, 1> >
     {
     public:
         DuneMatrix(const int rows, const int cols, const int* ia, const int* ja, const double* sa)
@@ -48,7 +47,8 @@ namespace Opm
             //   allocationSize(nnz), r(0), a(0),
             //   avg(0), overflowsize(-1.0)
         {
-            typedef Dune::BCRSMatrix<B> Super;
+            typedef Dune::BCRSMatrix< Dune::FieldMatrix<double, 1, 1> > Super;
+            typedef Super::block_type block_type;
             this->build_mode = Super::unknown;
             this->ready = Super::built;
             this->n = rows;
@@ -61,8 +61,8 @@ namespace Opm
             this->overflowsize = -1.0;
 #endif
 
-            this->a = new B[this->nnz];
-            static_assert(sizeof(B) == sizeof(double), "This constructor requires a block type that is the same as a double.");
+            this->a = new block_type[this->nnz];
+            static_assert(sizeof(block_type) == sizeof(double), "This constructor requires a block type that is the same as a double.");
             std::copy(sa, sa + this->nnz, reinterpret_cast<double*>(this->a));
             this->j.reset(new typename Super::size_type[this->nnz]);
             std::copy(ja, ja +this-> nnz, this->j.get());
diff --git a/opm/autodiff/NewtonIterationBlackoilCPR.cpp b/opm/autodiff/NewtonIterationBlackoilCPR.cpp
index 03485a664..5659d3121 100644
--- a/opm/autodiff/NewtonIterationBlackoilCPR.cpp
+++ b/opm/autodiff/NewtonIterationBlackoilCPR.cpp
@@ -466,7 +466,7 @@ namespace Opm
             const int* ia = matrix.outerIndexPtr();
             const int* ja = matrix.innerIndexPtr();
             const double* sa = matrix.valuePtr();
-            return Opm::DuneMatrix<MatrixBlockType>(size, size, ia, ja, sa);
+            return Opm::DuneMatrix(size, size, ia, ja, sa);
         }