diff --git a/meta/SelfEnergies.m b/meta/SelfEnergies.m
index 8ec803ad6..0c6b45aab 100644
--- a/meta/SelfEnergies.m
+++ b/meta/SelfEnergies.m
@@ -1023,7 +1023,6 @@
 const double rmtsq = Sqr(rmt);
 const double scalesq = Sqr(get_scale());
 const double vev2 = " <> vev2Str <> ";
-const double vev = Sqrt(" <> vev2Str <> ");
 const double tanb = " <> tanbStr <> ";
 const double amu = Re(" <> muStr <> ");
 const double mg = " <> m3Str <> ";
@@ -1033,22 +1032,20 @@
 const double rmbsq = Sqr(rmb);
 const double rmtausq = Sqr(" <> mtauStr <> ");
 const double lamS = Re(" <> lambdaStr <> ");
-static const double root2 = Sqrt(2.0);
-const double vevS =  vev / root2;
-const double svevS = " <> vsStr <> " / root2;
+const double svevS = " <> vsStr <> " / Sqrt(2.0);
 
 " <> CConversion`CreateCType[TreeMasses`GetMassMatrixType[SARAH`HiggsBoson]] <> " self_energy_2l(" <> CConversion`CreateCType[TreeMasses`GetMassMatrixType[SARAH`HiggsBoson]] <> "::Zero());
 
 if (HIGGS_2LOOP_CORRECTION_AT_AS) {
    self_energy_2l += self_energy_higgs_2loop_at_as_nmssm(
       rmt, mg, mst1sq, mst2sq, sxt, cxt,
-      scalesq, tanb, vevS, lamS, svevS, as, amu);
+      scalesq, tanb, vev2, lamS, svevS, as, amu);
 }
 
 if (HIGGS_2LOOP_CORRECTION_AB_AS) {
    self_energy_2l += self_energy_higgs_2loop_ab_as_nmssm(
       rmb, mg, msb1sq, msb2sq, sxb, cxb,
-      scalesq, cotb, vevS, lamS, svevS, as, amu);
+      scalesq, cotb, vev2, lamS, svevS, as, amu);
 }
 
 // Corrections as in MSSM, not corrected for NMSSM,
@@ -1124,7 +1121,6 @@
 const double rmtsq = Sqr(rmt);
 const double scalesq = Sqr(get_scale());
 const double vev2 = " <> vev2Str <> ";
-const double vev = Sqrt(" <> vev2Str <> ");
 const double tanb = " <> tanbStr <> ";
 const double amu = Re(" <> muStr <> ");
 const double mg = " <> m3Str <> ";
@@ -1134,22 +1130,20 @@
 const double rmbsq = Sqr(rmb);
 const double rmtausq = Sqr(" <> mtauStr <> ");
 const double lamS = Re(" <> lambdaStr <> ");
-static const double root2 = Sqrt(2.0);
-const double vevS =  vev / root2;
-const double svevS = " <> vsStr <> " / root2;
+const double svevS = " <> vsStr <> " / Sqrt(2.0);
 
 " <> CConversion`CreateCType[TreeMasses`GetMassMatrixType[SARAH`PseudoScalar]] <> " self_energy_2l(" <> CConversion`CreateCType[TreeMasses`GetMassMatrixType[SARAH`PseudoScalar]] <> "::Zero());
 
 if (HIGGS_2LOOP_CORRECTION_AT_AS) {
    self_energy_2l += self_energy_pseudoscalar_2loop_at_as_nmssm(
       rmt, mg, mst1sq, mst2sq, sxt, cxt,
-      scalesq, tanb, vevS, lamS, svevS, as, amu);
+      scalesq, tanb, vev2, lamS, svevS, as, amu);
 }
 
 if (HIGGS_2LOOP_CORRECTION_AB_AS) {
    self_energy_2l += self_energy_pseudoscalar_2loop_ab_as_nmssm(
       rmb, mg, msb1sq, msb2sq, sxb, cxb,
-      scalesq, cotb, vevS, lamS, svevS, as, amu);
+      scalesq, cotb, vev2, lamS, svevS, as, amu);
 }
 
 // Corrections as in MSSM, not corrected for NMSSM,
diff --git a/src/nmssm_twoloophiggs.cpp b/src/nmssm_twoloophiggs.cpp
index 92e019123..af59a663f 100644
--- a/src/nmssm_twoloophiggs.cpp
+++ b/src/nmssm_twoloophiggs.cpp
@@ -79,15 +79,14 @@ Eigen::Matrix<double, 3, 1> tadpole_higgs_2loop_ab_as_nmssm(
 
 Eigen::Matrix<double, 3, 3> self_energy_higgs_2loop_at_as_nmssm(
    double rmt, double mg, double mst12, double mst22,
-   double sxt, double cxt, double scale2, double tanb, double vevS,
+   double sxt, double cxt, double scale2, double tanb, double vev2,
    double lamS, double svevS, double as, double mu)
 {
-   const double vev2 = sqr(vevS * std::sqrt(2.));
    const double gs = std::sqrt(as * 4. * M_PI);
 
    const Eigen::Matrix<double, 3, 3> se =
       self_energy_higgs_2loop_at_as_nmssm_with_tadpoles(
-         rmt, mg, mst12, mst22, sxt, cxt, scale2, tanb, vevS, lamS, svevS, as);
+         rmt, mg, mst12, mst22, sxt, cxt, scale2, tanb, vev2, lamS, svevS, as);
 
    const Eigen::Matrix<double, 3, 3> tadpoles =
       tadpole_higgs_2loop_at_as_nmssm(
@@ -98,15 +97,14 @@ Eigen::Matrix<double, 3, 3> self_energy_higgs_2loop_at_as_nmssm(
 
 Eigen::Matrix<double, 3, 3> self_energy_higgs_2loop_ab_as_nmssm(
    double rmb, double mg, double msb12, double msb22,
-   double sxb, double cxb, double scale2, double cotb, double vevS,
+   double sxb, double cxb, double scale2, double cotb, double vev2,
    double lamS, double svevS, double as, double mu)
 {
-   const double vev2 = sqr(vevS * std::sqrt(2.));
    const double gs = std::sqrt(as * 4. * M_PI);
 
    const Eigen::Matrix<double, 3, 3> se =
       self_energy_higgs_2loop_ab_as_nmssm_with_tadpoles(
-         rmb, mg, msb12, msb22, sxb, cxb, scale2, cotb, vevS, lamS, svevS, as);
+         rmb, mg, msb12, msb22, sxb, cxb, scale2, cotb, vev2, lamS, svevS, as);
 
    const Eigen::Matrix<double, 3, 3> tadpoles =
       tadpole_higgs_2loop_ab_as_nmssm(
@@ -117,15 +115,14 @@ Eigen::Matrix<double, 3, 3> self_energy_higgs_2loop_ab_as_nmssm(
 
 Eigen::Matrix<double, 3, 3> self_energy_pseudoscalar_2loop_at_as_nmssm(
    double rmt, double mg, double mst12, double mst22,
-   double sxt, double cxt, double scale2, double tanb, double vevS,
+   double sxt, double cxt, double scale2, double tanb, double vev2,
    double lamS, double svevS, double as, double mu)
 {
-   const double vev2 = sqr(vevS * std::sqrt(2.));
    const double gs = std::sqrt(as * 4. * M_PI);
 
    const Eigen::Matrix<double, 3, 3> se =
       self_energy_pseudoscalar_2loop_at_as_nmssm_with_tadpoles(
-         rmt, mg, mst12, mst22, sxt, cxt, scale2, tanb, vevS,
+         rmt, mg, mst12, mst22, sxt, cxt, scale2, tanb, vev2,
          lamS, svevS, as);
 
    const Eigen::Matrix<double, 3, 3> tadpoles =
@@ -137,15 +134,14 @@ Eigen::Matrix<double, 3, 3> self_energy_pseudoscalar_2loop_at_as_nmssm(
 
 Eigen::Matrix<double, 3, 3> self_energy_pseudoscalar_2loop_ab_as_nmssm(
    double rmb, double mg, double msb12, double msb22,
-   double sxb, double cxb, double scale2, double cotb, double vevS,
+   double sxb, double cxb, double scale2, double cotb, double vev2,
    double lamS, double svevS, double as, double mu)
 {
-   const double vev2 = sqr(vevS * std::sqrt(2.));
    const double gs = std::sqrt(as * 4. * M_PI);
 
    const Eigen::Matrix<double, 3, 3> se =
       self_energy_pseudoscalar_2loop_ab_as_nmssm_with_tadpoles(
-         rmb, mg, msb12, msb22, sxb, cxb, scale2, cotb, vevS,
+         rmb, mg, msb12, msb22, sxb, cxb, scale2, cotb, vev2,
          lamS, svevS, as);
 
    const Eigen::Matrix<double, 3, 3> tadpoles =
@@ -157,17 +153,18 @@ Eigen::Matrix<double, 3, 3> self_energy_pseudoscalar_2loop_ab_as_nmssm(
 
 Eigen::Matrix<double, 3, 3> self_energy_higgs_2loop_at_as_nmssm_with_tadpoles(
    double rmt, double mg, double mst12, double mst22,
-   double sxt, double cxt, double scale2, double tanb, double vevS,
+   double sxt, double cxt, double scale2, double tanb, double vev2,
    double lamS, double svevS, double as)
 {
    int loop = 2;
+   double vev = std::sqrt(0.5 * vev2);
    double DMS[3][3] = {{ 0. }}, DMP[3][3] = {{ 0. }};
 
    {
       LOCK_MUTEX();
 
       effpot_(&loop, &rmt, &mg, &mst12, &mst22, &sxt, &cxt,
-              &scale2, &tanb, &vevS, &lamS, &svevS, &as, &DMS, &DMP);
+              &scale2, &tanb, &vev, &lamS, &svevS, &as, &DMS, &DMP);
    }
 
    Eigen::Matrix<double, 3, 3> result;
@@ -180,12 +177,12 @@ Eigen::Matrix<double, 3, 3> self_energy_higgs_2loop_at_as_nmssm_with_tadpoles(
 
 Eigen::Matrix<double, 3, 3> self_energy_higgs_2loop_ab_as_nmssm_with_tadpoles(
    double rmb, double mg, double msb12, double msb22,
-   double sxb, double cxb, double scale2, double cotb, double vevS,
+   double sxb, double cxb, double scale2, double cotb, double vev2,
    double lamS, double svevS, double as)
 {
    Eigen::Matrix<double, 3, 3> result =
       self_energy_higgs_2loop_at_as_nmssm_with_tadpoles(
-         rmb, mg, msb12, msb22, sxb, cxb, scale2, cotb, vevS,
+         rmb, mg, msb12, msb22, sxb, cxb, scale2, cotb, vev2,
          lamS, svevS, as);
 
    // Make appropriate substitutions for elements following 0907.4682
@@ -198,17 +195,18 @@ Eigen::Matrix<double, 3, 3> self_energy_higgs_2loop_ab_as_nmssm_with_tadpoles(
 
 Eigen::Matrix<double, 3, 3> self_energy_pseudoscalar_2loop_at_as_nmssm_with_tadpoles(
    double rmt, double mg, double mst12, double mst22,
-   double sxt, double cxt, double scale2, double tanb, double vevS,
+   double sxt, double cxt, double scale2, double tanb, double vev2,
    double lamS, double svevS, double as)
 {
    int loop = 2;
+   double vev = std::sqrt(0.5 * vev2);
    double DMS[3][3] = {{ 0. }}, DMP[3][3] = {{ 0. }};
 
    {
       LOCK_MUTEX();
 
       effpot_(&loop, &rmt, &mg, &mst12, &mst22, &sxt, &cxt,
-              &scale2, &tanb, &vevS, &lamS, &svevS, &as, &DMS, &DMP);
+              &scale2, &tanb, &vev, &lamS, &svevS, &as, &DMS, &DMP);
    }
 
    Eigen::Matrix<double, 3, 3> result;
@@ -221,12 +219,12 @@ Eigen::Matrix<double, 3, 3> self_energy_pseudoscalar_2loop_at_as_nmssm_with_tadp
 
 Eigen::Matrix<double, 3, 3> self_energy_pseudoscalar_2loop_ab_as_nmssm_with_tadpoles(
    double rmb, double mg, double msb12, double msb22,
-   double sxb, double cxb, double scale2, double cotb, double vevS,
+   double sxb, double cxb, double scale2, double cotb, double vev2,
    double lamS, double svevS, double as)
 {
    Eigen::Matrix<double, 3, 3> result =
       self_energy_pseudoscalar_2loop_at_as_nmssm_with_tadpoles(
-         rmb, mg, msb12, msb22, sxb, cxb, scale2, cotb, vevS,
+         rmb, mg, msb12, msb22, sxb, cxb, scale2, cotb, vev2,
          lamS, svevS, as);
 
    // Make appropriate substitutions for elements following 0907.4682
diff --git a/src/nmssm_twoloophiggs.hpp b/src/nmssm_twoloophiggs.hpp
index 75e668a0b..cdb516a32 100644
--- a/src/nmssm_twoloophiggs.hpp
+++ b/src/nmssm_twoloophiggs.hpp
@@ -52,7 +52,6 @@
  * tanb   : DR-bar tan(beta) = vu/vd in the MSSM
  * cotb   : DR-bar 1/tan(beta) in the MSSM
  * vev2   : squared DR-bar vev^2 = (vu^2 + vd^2) in the MSSM
- * vevS   : DR-bar vev = sqrt(vu^2 + vd^2) in the MSSM
  * svevS  : DR-bar singlet vev = vS / sqrt(2)
  *
  * scheme : DR-bar scheme (0) or on-shell scheme (1)
@@ -73,42 +72,42 @@ Eigen::Matrix<double, 3, 1> tadpole_higgs_2loop_ab_as_nmssm(
 
 Eigen::Matrix<double, 3, 3> self_energy_higgs_2loop_at_as_nmssm(
    double rmt, double mg, double mst12, double mst22,
-   double sxt, double cxt, double scale2, double tanb, double vevS,
+   double sxt, double cxt, double scale2, double tanb, double vev2,
    double lamS, double svevS, double as, double mu);
 
 Eigen::Matrix<double, 3, 3> self_energy_higgs_2loop_ab_as_nmssm(
    double rmb, double mg, double msb12, double msb22,
-   double sxb, double cxb, double scale2, double cotb, double vevS,
+   double sxb, double cxb, double scale2, double cotb, double vev2,
    double lamS, double svevS, double as, double mu);
 
 Eigen::Matrix<double, 3, 3> self_energy_pseudoscalar_2loop_at_as_nmssm(
    double rmt, double mg, double mst12, double mst22,
-   double sxt, double cxt, double scale2, double tanb, double vevS,
+   double sxt, double cxt, double scale2, double tanb, double vev2,
    double lamS, double svevS, double as, double mu);
 
 Eigen::Matrix<double, 3, 3> self_energy_pseudoscalar_2loop_ab_as_nmssm(
    double rmb, double mg, double msb12, double msb22,
-   double sxb, double cxb, double scale2, double cotb, double vevS,
+   double sxb, double cxb, double scale2, double cotb, double vev2,
    double lamS, double svevS, double as, double mu);
 
 Eigen::Matrix<double, 3, 3> self_energy_higgs_2loop_at_as_nmssm_with_tadpoles(
    double rmt, double mg, double mst12, double mst22,
-   double sxt, double cxt, double scale2, double tanb, double vevS,
+   double sxt, double cxt, double scale2, double tanb, double vev2,
    double lamS, double svevS, double as);
 
 Eigen::Matrix<double, 3, 3> self_energy_higgs_2loop_ab_as_nmssm_with_tadpoles(
    double rmb, double mg, double msb12, double msb22,
-   double sxb, double cxb, double scale2, double cotb, double vevS,
+   double sxb, double cxb, double scale2, double cotb, double vev2,
    double lamS, double svevS, double as);
 
 Eigen::Matrix<double, 3, 3> self_energy_pseudoscalar_2loop_at_as_nmssm_with_tadpoles(
    double rmt, double mg, double mst12, double mst22,
-   double sxt, double cxt, double scale2, double tanb, double vevS,
+   double sxt, double cxt, double scale2, double tanb, double vev2,
    double lamS, double svevS, double as);
 
 Eigen::Matrix<double, 3, 3> self_energy_pseudoscalar_2loop_ab_as_nmssm_with_tadpoles(
    double rmb, double mg, double msb12, double msb22,
-   double sxb, double cxb, double scale2, double cotb, double vevS,
+   double sxb, double cxb, double scale2, double cotb, double vev2,
    double lamS, double svevS, double as);
 
 } // namespace nmssm_twoloophiggs