diff --git a/opm/simulators/wells/WellGroupHelpers.cpp b/opm/simulators/wells/WellGroupHelpers.cpp
index 08c7ce9dd..53de32fd6 100644
--- a/opm/simulators/wells/WellGroupHelpers.cpp
+++ b/opm/simulators/wells/WellGroupHelpers.cpp
@@ -859,7 +859,7 @@ namespace WellGroupHelpers
             = wellState.currentInjectionGroupControl(injectionPhase, group.name());
         if (currentGroupControl == Group::InjectionCMode::FLD || currentGroupControl == Group::InjectionCMode::NONE) {
             // Return if we are not available for parent group.
-            if (!group.isAvailableForGroupControl()) {
+            if (!group.injectionGroupControlAvailable(injectionPhase)) {
                 return std::make_pair(false, 1.0);
             }
             // Otherwise: check injection share of parent's control.
@@ -1085,7 +1085,7 @@ namespace WellGroupHelpers
 
         if (currentGroupControl == Group::ProductionCMode::FLD || currentGroupControl == Group::ProductionCMode::NONE) {
             // Return if we are not available for parent group.
-            if (!group.isAvailableForGroupControl()) {
+            if (!group.productionGroupControlAvailable()) {
                 return std::make_pair(false, 1);
             }
             // Otherwise: check production share of parent's control.
diff --git a/opm/simulators/wells/WellInterface_impl.hpp b/opm/simulators/wells/WellInterface_impl.hpp
index f5d18dbc1..e56e055e6 100644
--- a/opm/simulators/wells/WellInterface_impl.hpp
+++ b/opm/simulators/wells/WellInterface_impl.hpp
@@ -2075,7 +2075,7 @@ namespace Opm
 
         if (currentGroupControl == Group::InjectionCMode::FLD ||
             currentGroupControl == Group::InjectionCMode::NONE) {
-            if (!group.isAvailableForGroupControl()) {
+            if (!group.injectionGroupControlAvailable(injectionPhase)) {
                 // We cannot go any further up the hierarchy. This could
                 // be the FIELD group, or any group for which this has
                 // been set in GCONINJE or GCONPROD. If we are here
@@ -2214,7 +2214,7 @@ namespace Opm
         const Group::ProductionCMode& currentGroupControl = well_state.currentProductionGroupControl(group.name());
         if (currentGroupControl == Group::ProductionCMode::FLD ||
             currentGroupControl == Group::ProductionCMode::NONE) {
-            if (!group.isAvailableForGroupControl()) {
+            if (!group.productionGroupControlAvailable()) {
                 // We cannot go any further up the hierarchy. This could
                 // be the FIELD group, or any group for which this has
                 // been set in GCONINJE or GCONPROD. If we are here