diff --git a/opm/simulators/wells/StandardWell_impl.hpp b/opm/simulators/wells/StandardWell_impl.hpp
index c89e3b25e..3fef6aa97 100644
--- a/opm/simulators/wells/StandardWell_impl.hpp
+++ b/opm/simulators/wells/StandardWell_impl.hpp
@@ -2508,7 +2508,6 @@ namespace Opm
 
 
         const WellControls* wc = well_controls_;
-        const double* distr = well_controls_get_current_distr(wc);
         const auto pu = phaseUsage();
 
         if(std::abs(total_well_rate) > 0.) {
@@ -2525,7 +2524,7 @@ namespace Opm
             if (well_type_ == INJECTOR) {
                 // only single phase injection handled
                 if (FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx)) {
-                    if (distr[Water] > 0.0) {
+                    if (well_ecl_.getPreferredPhase() == Phase::WATER) {
                         primary_variables_[WFrac] = 1.0;
                     } else {
                         primary_variables_[WFrac] = 0.0;
@@ -2533,7 +2532,7 @@ namespace Opm
                 }
 
                 if (FluidSystem::phaseIsActive(FluidSystem::gasPhaseIdx)) {
-                    if (distr[pu.phase_pos[Gas]] > 0.0) {
+                    if (well_ecl_.getPreferredPhase() == Phase::GAS) {
                         primary_variables_[GFrac] = 1.0 - wsolvent();
                         if (has_solvent) {
                             primary_variables_[SFrac] = wsolvent();
diff --git a/opm/simulators/wells/WellInterface_impl.hpp b/opm/simulators/wells/WellInterface_impl.hpp
index f25c37ebd..cf4ccf1fe 100644
--- a/opm/simulators/wells/WellInterface_impl.hpp
+++ b/opm/simulators/wells/WellInterface_impl.hpp
@@ -1205,7 +1205,6 @@ namespace Opm
     WellInterface<TypeTag>::scalingFactor(const int phaseIdx) const
     {
         const WellControls* wc = well_controls_;
-        const double* distr = well_controls_get_current_distr(wc);
 
         if (well_controls_get_current(wc) != -1 && well_controls_get_current_type(wc) == RESERVOIR_RATE) {
             if (has_solvent && phaseIdx == contiSolventEqIdx ) {
@@ -1215,6 +1214,7 @@ namespace Opm
                 return coeff;
             }
             // TODO: use the rateConverter here as well.
+            const double* distr = well_controls_get_current_distr(wc);
             return distr[phaseIdx];
         }
         const auto& pu = phaseUsage();