diff --git a/packages/control/chargepoint/chargepoint.py b/packages/control/chargepoint/chargepoint.py
index e8fddeab60..7391a9c08c 100644
--- a/packages/control/chargepoint/chargepoint.py
+++ b/packages/control/chargepoint/chargepoint.py
@@ -665,8 +665,7 @@ def update(self, ev_list: Dict[str, Ev]) -> None:
                         self.template.data.charging_type,
                         self.data.control_parameter.timestamp_chargemode_changed or create_timestamp(),
                         self.data.set.log.imported_since_plugged,
-                        self.hw_bidi_capable(),
-                        self.data.get.phases_in_use)
+                        self.hw_bidi_capable())
                     required_phases = self.get_phases_by_selected_chargemode(template_phases)
                     required_phases = self.set_phases(required_phases, template_phases)
                     self._pub_connected_vehicle(charging_ev)
diff --git a/packages/control/ev/charge_template.py b/packages/control/ev/charge_template.py
index 41c206528a..f398ad0104 100644
--- a/packages/control/ev/charge_template.py
+++ b/packages/control/ev/charge_template.py
@@ -421,7 +421,7 @@ def _calc_remaining_time(self,
                              control_parameter_phases: int,
                              soc_request_interval_offset: int,
                              bidi_state: BidiState) -> SelectedPlan:
-        bidi = BidiState.BIDI_CAPABLE and plan.bidi_charging_enabled
+        bidi = bidi_state == BidiState.BIDI_CAPABLE and plan.bidi_charging_enabled
         if bidi:
             duration, missing_amount = self._calculate_duration(
                 plan, soc, ev_template.data.battery_capacity,
diff --git a/packages/control/ev/ev.py b/packages/control/ev/ev.py
index b1c1c54767..60745ce329 100644
--- a/packages/control/ev/ev.py
+++ b/packages/control/ev/ev.py
@@ -122,8 +122,7 @@ def get_required_current(self,
                              charging_type: str,
                              chargemode_switch_timestamp: float,
                              imported_since_plugged: float,
-                             bidi: BidiState,
-                             phases_in_use: int) -> Tuple[bool, Optional[str], str, float, int]:
+                             bidi: BidiState) -> Tuple[bool, Optional[str], str, float, int]:
         """ ermittelt, ob und mit welchem Strom das EV geladen werden soll (unabhängig vom Lastmanagement)
 
         Parameter
@@ -397,7 +396,6 @@ def auto_phase_switch(self,
     def _remaining_phase_switch_time(self, control_parameter: ControlParameter,
                                      waiting_time: float,
                                      buffer: float) -> float:
-
         if control_parameter.timestamp_phase_switch_buffer_start is None:
             control_parameter.timestamp_phase_switch_buffer_start = timecheck.create_timestamp()
         # Wenn der Puffer seit der letzen Umschaltung abgelaufen ist, warte noch die Umschaltverzögerung ab. ODER