diff --git a/swad_agenda.c b/swad_agenda.c
index 7e413c81d..5d10ad143 100644
--- a/swad_agenda.c
+++ b/swad_agenda.c
@@ -718,6 +718,7 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod)
    char *Anchor = NULL;
    static unsigned UniqueId = 0;
    struct AgendaEvent AgdEvent;
+   Dat_StartEndTime_t StartEndTime;
    char Txt[Cns_MAX_BYTES_TEXT + 1];
 
    /***** Get data of this event *****/
@@ -739,36 +740,27 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod)
    Frm_SetAnchorStr (AgdEvent.AgdCod,&Anchor);
 
    /***** Write first row of data of this event *****/
-   /* Start date/time */
-   UniqueId++;
-   fprintf (Gbl.F.Out,"<tr>"
-	              "<td id=\"agd_date_start_%u\" class=\"%s LEFT_BOTTOM COLOR%u\">"
-                      "<script type=\"text/javascript\">"
-                      "writeLocalDateHMSFromUTC('agd_date_start_%u',%ld,"
-                      "%u,'<br />','%s',true,true,0x6);"
-                      "</script>"
-	              "</td>",
-	    UniqueId,
-            AgdEvent.Hidden ? Dat_TimeStatusClassHidden[AgdEvent.TimeStatus] :
-        	              Dat_TimeStatusClassVisible[AgdEvent.TimeStatus],
-            Gbl.RowEvenOdd,
-            UniqueId,AgdEvent.TimeUTC[Agd_START_TIME],
-            (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+   fprintf (Gbl.F.Out,"<tr>");
 
-   /* End date/time */
+   /* Start/end date/time */
    UniqueId++;
-   fprintf (Gbl.F.Out,"<td id=\"agd_date_end_%u\" class=\"%s LEFT_BOTTOM COLOR%u\">"
-                      "<script type=\"text/javascript\">"
-                      "writeLocalDateHMSFromUTC('agd_date_end_%u',%ld,"
-                      "%u,'<br />','%s',false,true,0x6);"
-                      "</script>"
-	              "</td>",
-	    UniqueId,
-            AgdEvent.Hidden ? Dat_TimeStatusClassHidden[AgdEvent.TimeStatus] :
-        	              Dat_TimeStatusClassVisible[AgdEvent.TimeStatus],
-            Gbl.RowEvenOdd,
-            UniqueId,AgdEvent.TimeUTC[Agd_END_TIME],
-            (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+   for (StartEndTime = (Dat_StartEndTime_t) 0;
+	StartEndTime <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1);
+	StartEndTime++)
+      fprintf (Gbl.F.Out,"<td id=\"agd_date_%u_%u\""
+	                 " class=\"%s LEFT_BOTTOM COLOR%u\">"
+			 "<script type=\"text/javascript\">"
+			 "writeLocalDateHMSFromUTC('agd_date_%u_%u',%ld,"
+			 "%u,'<br />','%s',true,true,0x6);"
+			 "</script>"
+			 "</td>",
+	       (unsigned) StartEndTime,UniqueId,
+	       AgdEvent.Hidden ? Dat_TimeStatusClassHidden[AgdEvent.TimeStatus] :
+				 Dat_TimeStatusClassVisible[AgdEvent.TimeStatus],
+	       Gbl.RowEvenOdd,
+	       (unsigned) StartEndTime,UniqueId,
+	       AgdEvent.TimeUTC[StartEndTime],
+	       (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
 
    /* Event */
    fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP COLOR%u\">",
@@ -783,13 +775,14 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod)
    /* Location */
    fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP COLOR%u\">"
                       "<div class=\"%s\">%s</div>"
-                      "</td>"
-	              "</tr>",
+                      "</td>",
             Gbl.RowEvenOdd,
             AgdEvent.Hidden ? "ASG_TITLE_LIGHT" :
         	              "ASG_TITLE",
             AgdEvent.Location);
 
+   fprintf (Gbl.F.Out,"</tr>");
+
    /***** Write second row of data of this event *****/
    fprintf (Gbl.F.Out,"<tr>"
 	              "<td colspan=\"2\" class=\"LEFT_TOP COLOR%u\">",
diff --git a/swad_changelog.h b/swad_changelog.h
index 6e3596f2f..6d28d0391 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -470,10 +470,11 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
 En OpenSWAD:
 ps2pdf source.ps destination.pdf
 */
-#define Log_PLATFORM_VERSION	"SWAD 19.16.3 (2019-09-27)"
+#define Log_PLATFORM_VERSION	"SWAD 19.16.4 (2019-09-27)"
 #define CSS_FILE		"swad19.15.css"
 #define JS_FILE			"swad19.15.js"
 /*
+	Version 19.16.4:  Sep 27, 2019	Code refactoring in agenda. (246407 lines)
 	Version 19.16.3:  Sep 27, 2019	Code refactoring in game dates. (246414 lines)
 	Version 19.16.2:  Sep 26, 2019	Fixed bugs in edition of games.
 				        Changed listing of games and surveys. (246422 lines)