@@ -468,7 +468,7 @@ class WeinanlieferungSlotAssistantController extends AbstractController

             $arrEndTimes = [];

             // Get existing slots in the timeframe

-            $ExistingSlots = $this->db->prepare("SELECT id, date, time as 'start', (time+duration*60) as 'end', duration FROM tl_vr_wa_slot WHERE pid = ? AND (time >= ? OR time+$intDuration+$intBuffer >= ?) AND (time <= ? OR time+$intDuration+$intBuffer <= ?) ORDER BY time")

+            $ExistingSlots = $this->db->prepare("SELECT id, date, time as 'start', (time+duration*60-1) as 'end', duration FROM tl_vr_wa_slot WHERE pid = ? AND (time >= ? OR time+$intDuration+$intBuffer >= ?) AND (time <= ? OR time+$intDuration+$intBuffer <= ?) ORDER BY time")

                                       ->executeQuery([$Standort->id, $intStart, $intStart, $intEnd, $intEnd]);

             if ($ExistingSlots->rowCount())

@@ -486,7 +486,7 @@ class WeinanlieferungSlotAssistantController extends AbstractController

             // Create all possible timeslots for given timeframe

             $intTime = $intStart;

-            while ($intTime < $intEnd-$intDuration)

+            while ($intTime <= $intEnd-$intDuration)

             {

                 $arrConflicts = [];

@@ -509,7 +509,7 @@ class WeinanlieferungSlotAssistantController extends AbstractController

                 if (\count($arrConflicts) > 0)

                 {

-                    $intTime = max($arrConflicts) + $intBuffer;

+                    $intTime = max($arrConflicts) + (max($intBuffer,1));

                     continue;

                 }