diff --git a/unsupported/Eigen/src/NonLinear/MathFunctions.h b/unsupported/Eigen/src/NonLinear/MathFunctions.h
index e0db55a82..c9262075a 100644
--- a/unsupported/Eigen/src/NonLinear/MathFunctions.h
+++ b/unsupported/Eigen/src/NonLinear/MathFunctions.h
@@ -36,7 +36,7 @@ int ei_hybrd1(
     Matrix< Scalar, Dynamic, 1 > wa(lwa);
 
     fvec.resize(x.size());
-    return hybrd1_template<double>(Functor::f, 0, x.size(), x.data(), fvec.data(), tol, wa.data(), lwa);
+    return hybrd1_template<Scalar>(Functor::f, 0, x.size(), x.data(), fvec.data(), tol, wa.data(), lwa);
 }
 
 template<typename Functor, typename Scalar>
@@ -70,7 +70,7 @@ int ei_hybrd(
     R.resize(lr);
     int ldfjac = n;
     fjac.resize(ldfjac, n);
-    return hybrd_template<double>(
+    return hybrd_template<Scalar>(
             Functor::f, 0,
             n, x.data(), fvec.data(),
             xtol, maxfev,
@@ -103,7 +103,7 @@ int ei_hybrj1(
 
     fvec.resize(n);
     fjac.resize(ldfjac, n);
-    return hybrj1_template<double>(Functor::f, 0, n, x.data(), fvec.data(), fjac.data(), ldfjac, tol, wa.data(), lwa);
+    return hybrj1_template<Scalar>(Functor::f, 0, n, x.data(), fvec.data(), fjac.data(), ldfjac, tol, wa.data(), lwa);
 }
 
 
@@ -133,7 +133,7 @@ int ei_hybrj(
     R.resize(lr);
     int ldfjac = n;
     fjac.resize(ldfjac, n);
-    return hybrj_template<double> (
+    return hybrj_template<Scalar> (
             Functor::f, 0,
             n, x.data(), fvec.data(),
             fjac.data(), ldfjac,
@@ -163,7 +163,7 @@ int ei_lmstr1(
     Matrix< Scalar, Dynamic, Dynamic > fjac(ldfjac, x.size());
 
     ipvt.resize(x.size());
-    return lmstr1_template<double>(
+    return lmstr1_template<Scalar>(
             Functor::f, 0,
             fvec.size(), x.size(), x.data(), fvec.data(),
             fjac.data() , ldfjac,
@@ -183,7 +183,7 @@ int ei_lmstr(
         VectorXi &ipvt,
         Matrix< Scalar, Dynamic, 1 >  &diag,
         int mode=1,
-        double factor = 100.,
+        Scalar factor = 100.,
         int maxfev = 400,
         Scalar ftol = ei_sqrt(epsilon<Scalar>()),
         Scalar xtol = ei_sqrt(epsilon<Scalar>()),
@@ -200,7 +200,7 @@ int ei_lmstr(
     ipvt.resize(x.size());
     fjac.resize(ldfjac, x.size());
     diag.resize(x.size());
-    return lmstr_template<double> (
+    return lmstr_template<Scalar> (
             Functor::f, 0,
             fvec.size(), x.size(), x.data(), fvec.data(),
             fjac.data() , ldfjac,
@@ -232,7 +232,7 @@ int ei_lmder1(
     Matrix< Scalar, Dynamic, Dynamic > fjac(ldfjac, x.size());
 
     ipvt.resize(x.size());
-    return lmder1_template <double> (
+    return lmder1_template<Scalar> (
             Functor::f, 0,
             fvec.size(), x.size(), x.data(), fvec.data(),
             fjac.data() , ldfjac,
@@ -252,7 +252,7 @@ int ei_lmder(
         VectorXi &ipvt,
         Matrix< Scalar, Dynamic, 1 >  &diag,
         int mode=1,
-        double factor = 100.,
+        Scalar factor = 100.,
         int maxfev = 400,
         Scalar ftol = ei_sqrt(epsilon<Scalar>()),
         Scalar xtol = ei_sqrt(epsilon<Scalar>()),
@@ -269,7 +269,7 @@ int ei_lmder(
     ipvt.resize(x.size());
     fjac.resize(ldfjac, x.size());
     diag.resize(x.size());
-    return lmder_template<double>(
+    return lmder_template<Scalar>(
             Functor::f, 0,
             fvec.size(), x.size(), x.data(), fvec.data(),
             fjac.data() , ldfjac,
@@ -294,7 +294,7 @@ int ei_lmdif(
         VectorXi &ipvt,
         Matrix< Scalar, Dynamic, 1 >  &diag,
         int mode=1,
-        double factor = 100.,
+        Scalar factor = 100.,
         int maxfev = 400,
         Scalar ftol = ei_sqrt(epsilon<Scalar>()),
         Scalar xtol = ei_sqrt(epsilon<Scalar>()),
@@ -312,7 +312,7 @@ int ei_lmdif(
     ipvt.resize(x.size());
     fjac.resize(ldfjac, x.size());
     diag.resize(x.size());
-    return lmdif_template<double> (
+    return lmdif_template<Scalar> (
             Functor::f, 0,
             fvec.size(), x.size(), x.data(), fvec.data(),
             ftol, xtol, gtol, 
@@ -345,7 +345,7 @@ int ei_lmdif1(
 
     iwa.resize(n);
     wa.resize(lwa);
-    return lmdif1_template<double> (
+    return lmdif1_template<Scalar> (
             Functor::f, 0,
             fvec.size(), n, x.data(), fvec.data(),
             tol,
@@ -370,7 +370,7 @@ void ei_chkder(
         xp.resize(ldfjac);
     else
         err.resize(ldfjac);
-    chkder_template<double>(
+    chkder_template<Scalar>(
             fvec.size(), x.size(), x.data(), fvec.data(),
             fjac.data(), ldfjac,
             xp.data(),