diff --git a/opm/simulators/flow/GenericTracerModel.hpp b/opm/simulators/flow/GenericTracerModel.hpp
index 02227cc8791..ada91bb5b85 100644
--- a/opm/simulators/flow/GenericTracerModel.hpp
+++ b/opm/simulators/flow/GenericTracerModel.hpp
@@ -85,9 +85,9 @@ class GenericTracerModel {
     */
     const std::map<std::pair<std::string, std::string>, Scalar>&
     getWellTracerRates() const {return wellTracerRate_;}
-    const std::map<std::pair<std::string, std::string>, double>&
+    const std::map<std::pair<std::string, std::string>, Scalar>&
     getWellFreeTracerRates() const {return wellFreeTracerRate_;}
-    const std::map<std::pair<std::string, std::string>, double>&
+    const std::map<std::pair<std::string, std::string>, Scalar>&
     getWellSolTracerRates() const {return wellSolTracerRate_;}
 
     template<class Serializer>
@@ -136,8 +136,8 @@ class GenericTracerModel {
 
     // <wellName, tracerIdx> -> wellRate
     std::map<std::pair<std::string, std::string>, Scalar> wellTracerRate_;
-    std::map<std::pair<std::string, std::string>, double> wellFreeTracerRate_;
-    std::map<std::pair<std::string, std::string>, double> wellSolTracerRate_;
+    std::map<std::pair<std::string, std::string>, Scalar> wellFreeTracerRate_;
+    std::map<std::pair<std::string, std::string>, Scalar> wellSolTracerRate_;
     /// \brief Function returning the cell centers
     std::function<std::array<double,dimWorld>(int)> centroids_;
 };
diff --git a/opm/simulators/flow/TracerModel.hpp b/opm/simulators/flow/TracerModel.hpp
index c1b3b29a7ad..6443d8441eb 100644
--- a/opm/simulators/flow/TracerModel.hpp
+++ b/opm/simulators/flow/TracerModel.hpp
@@ -466,7 +466,7 @@ class TracerModel : public GenericTracerModel<GetPropType<TypeTag, Properties::G
             this->wellSolTracerRate_[std::make_pair(eclWell.name(), this->wellsname(tr.idx_[tIdx]))] = 0.0;
         }
 
-        std::vector<double> wtracer(tr.numTracer());
+        std::vector<Scalar> wtracer(tr.numTracer());
         for (int tIdx = 0; tIdx < tr.numTracer(); ++tIdx) {
             wtracer[tIdx] = this->currentConcentration_(eclWell, this->name(tr.idx_[tIdx]));
         }