diff --git a/opm/simulators/wells/MultisegmentWell_impl.hpp b/opm/simulators/wells/MultisegmentWell_impl.hpp
index b95dab391..a14ece2bc 100644
--- a/opm/simulators/wells/MultisegmentWell_impl.hpp
+++ b/opm/simulators/wells/MultisegmentWell_impl.hpp
@@ -1853,6 +1853,9 @@ namespace Opm
 
             updateWellState(dx_well, well_state, deferred_logger, relaxation_factor);
 
+            // TODO: should we do something more if a switching of control happens
+            this->updateWellControl(ebosSimulator, well_state, deferred_logger);
+
             initPrimaryVariablesEvaluation();
         }
 
diff --git a/opm/simulators/wells/WellInterface.hpp b/opm/simulators/wells/WellInterface.hpp
index 0dd8608a1..ae6f5f0e1 100644
--- a/opm/simulators/wells/WellInterface.hpp
+++ b/opm/simulators/wells/WellInterface.hpp
@@ -190,7 +190,7 @@ namespace Opm
                                                WellState& well_state,
                                                Opm::DeferredLogger& deferred_logger) const = 0;
 
-        void updateWellControl(/* const */ Simulator& ebos_simulator,
+        void updateWellControl(const Simulator& ebos_simulator,
                                WellState& well_state,
                                Opm::DeferredLogger& deferred_logger) /* const */;
 
diff --git a/opm/simulators/wells/WellInterface_impl.hpp b/opm/simulators/wells/WellInterface_impl.hpp
index ffc198507..3b6028f5d 100644
--- a/opm/simulators/wells/WellInterface_impl.hpp
+++ b/opm/simulators/wells/WellInterface_impl.hpp
@@ -430,7 +430,7 @@ namespace Opm
     template<typename TypeTag>
     void
     WellInterface<TypeTag>::
-    updateWellControl(/* const */ Simulator& ebos_simulator,
+    updateWellControl(const Simulator& ebos_simulator,
                       WellState& well_state,
                       Opm::DeferredLogger& deferred_logger) /* const */
     {