1 files changed, 2 insertions, 3 deletions
diff --git a/includes/model/NeededAngelTypes_model.php b/includes/model/NeededAngelTypes_model.php
index e04ef8b8..76796869 100644
--- a/includes/model/NeededAngelTypes_model.php
+++ b/includes/model/NeededAngelTypes_model.php
@@ -84,13 +84,12 @@ function NeededAngelTypes_by_shift($shiftId) {
     }
   }
   
+  $shift_entries = ShiftEntries_by_shift($shiftId);
   $needed_angeltypes = [];
   foreach ($needed_angeltypes_source as $angeltype) {
-    $shift_entries = ShiftEntries_by_shift_and_angeltype($shiftId, $angeltype['angel_type_id']);
-    
     $angeltype['taken'] = 0;
     foreach($shift_entries as $shift_entry) {
-      if($shift_entry['freeloaded'] == 0) {
+      if($shift_entry['TID']==$angeltype['id'] && $shift_entry['freeloaded'] == 0) {
         $angeltype['taken']++;
       }
     }