diff --git a/html/SQL.php b/html/SQL.php
index 1bf97d5..cfd25f1 100644
--- a/html/SQL.php
+++ b/html/SQL.php
@@ -21,6 +21,9 @@ class DB {
     {
         if(self::$instance == null){
             self::$instance = new DB();
+            // Set database to german (FIXME should be configurable)
+            self::prepare(__METHOD__,"SET lc_time_names = 'de_DE'");
+            self::execute(__METHOD__);
         }
         return self::$instance;
     }
@@ -629,10 +632,11 @@ function GetSchichtenEinesDienstes($DienstID)
 {
     //$sql = "SELECT SchichtID,Von,Bis,Soll,DATE_FORMAT(Von,'%a %H:%i') AS TagVon FROM Schicht where DienstID=".$DienstID;
     $db = DB::getInstance();
-    $db->prepare(__METHOD__,"SELECT SchichtID,Von,Bis,Soll,DATE_FORMAT(Von,'%a %H:%i') AS TagVon, DATE_FORMAT(Von,'%H:%i') AS ZeitVon, DATE_FORMAT(Bis,'%H:%i') AS ZeitBis FROM Schicht where DienstID=:id");
+    $db->prepare(__METHOD__,"SELECT SchichtID,Von,Bis,Soll,DATE_FORMAT(Von,'%a %H:%i') AS TagVon, DATE_FORMAT(Von,'%H:%i') AS ZeitVon, DATE_FORMAT(Bis,'%H:%i') AS ZeitBis, DATE_FORMAT(Dauer,'%H:%i') AS Dauer FROM Schicht where DienstID=:id");
     $db_erg = $db->execute(__METHOD__,['id' => $DienstID]);
     $db->onErrorDie(__METHOD__);
-    return $db_erg;
+    $schichten = $db->fetchAll(__METHOD__);
+    return $schichten;
 }
 
 function ChangeSchicht($SchichtID, $Von, $Bis, $Soll)
@@ -650,6 +654,7 @@ function ChangeSchicht($SchichtID, $Von, $Bis, $Soll)
     $db->onErrorDie(__METHOD__);
 }
 
+// ok
 function NewSchicht($DienstID, $Von, $Bis, $Soll, $Dauer)
 {
 
diff --git a/html/SQL_old.php b/html/SQL_old.php
index 38ff176..798b900 100644
--- a/html/SQL_old.php
+++ b/html/SQL_old.php
@@ -673,7 +673,9 @@ function GetSchichtenEinesDienstes($db_link, $DienstID)
         echo $sql;
         die('Ungueltige Abfrage: ' . mysqli_error($db_link));
     }
-    return $db_erg;
+    while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
+    array_pop($zeilen);
+    return $zeilen;
 }
 
 function ChangeSchicht($db_link, $SchichtID, $Von, $Bis, $Soll, $Dauer)
diff --git a/html/testPDO.php b/html/testPDO.php
index 5801946..98a513d 100644
--- a/html/testPDO.php
+++ b/html/testPDO.php
@@ -406,14 +406,15 @@ function TestGetSchichtenForDienstForDay(){
 }
 
 function TestGetSchichtenEinesDienstes(){
+    $dienste = GetDienste();
     $dbl = old\ConnectDB();
-    $erg_old = old\GetSchichtenEinesDienstes($dbl, $DienstID);
-    $erg_new = GetSchichtenEinesDienstes($DienstID);
+    $erg_old = old\GetSchichtenEinesDienstes($dbl, $dienste[0]["DienstID"]);
+    $erg_new = GetSchichtenEinesDienstes($dienste[0]["DienstID"]);
     if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){
         echo "Old GetSchichtenEinesDienstes returns".var_export($erg_old, true)."\n";
         echo "New GetSchichtenEinesDienstes returns '".var_export($erg_new, true)."'\n";
     }
-    else echo "GetSchichtenEinesDienstes ok";
+    else echo "GetSchichtenEinesDienstes ok\n";
 }
 
 function TestChangeSchicht(){
@@ -519,4 +520,5 @@ TestNewDienst();
 TestChangeDienst();
 TestGetDiensteChilds();
 TestNewSchicht();
+TestGetSchichtenEinesDienstes();
 ?>