diff --git a/swad_changelog.h b/swad_changelog.h
index 7d2eb0809..e3ef28f40 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -189,13 +189,14 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 16.107.1 (2016-12-26)"
+#define Log_PLATFORM_VERSION	"SWAD 16.107.2 (2016-12-26)"
 #define CSS_FILE		"swad16.106.5.css"
 #define JS_FILE			"swad16.101.js"
 
 // Number of lines (includes comments but not blank lines) has been got with the following command:
 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
 /*
+        Version 16.107.2: Dec 26, 2016	Changes in behaviour of labels in forms. (211525 lines)
         Version 16.107.1: Dec 26, 2016	Changes in behaviour of labels in forms.
                                         Code refactoring in tests. (211515 lines)
         Version 16.107:   Dec 26, 2016	Changes in behaviour of labels in forms.
diff --git a/swad_timetable.c b/swad_timetable.c
index 7a08978fb..544681b4a 100644
--- a/swad_timetable.c
+++ b/swad_timetable.c
@@ -1310,7 +1310,9 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns
 	    if (TimeTableView == TT_CRS_EDIT)
 	      {
 	       /***** Group *****/
-	       fprintf (Gbl.F.Out,"<br />%s"
+	       fprintf (Gbl.F.Out,"<br />"
+		                  "<label>"
+		                  "%s"
 	                          "<select name=\"ModTTGrpCod\""
 	                          " style=\"width:110px;\""
 		                  " onchange=\"document.getElementById('%s').submit();\">",
@@ -1336,23 +1338,30 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns
 	        	      Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypName,
                               Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].LstGrps[NumGrp].GrpName);
                     }
-	       fprintf (Gbl.F.Out,"</select>");
+	       fprintf (Gbl.F.Out,"</select>"
+		                  "</label>");
 
 	       /***** Class room *****/
-	       fprintf (Gbl.F.Out,"<br />%s"
+	       fprintf (Gbl.F.Out,"<br />"
+		                  "<label>"
+		                  "%s"
 	                          "<input type=\"text\" name=\"ModHorLugar\""
 	                          " size=\"1\" maxlength=\"%u\" value=\"%s\""
-		                  " onchange=\"document.getElementById('%s').submit();\" />",
+		                  " onchange=\"document.getElementById('%s').submit();\" />"
+		                  "</label>",
 		        Txt_Classroom,TT_MAX_LENGTH_PLACE,Place,Gbl.Form.Id);
 	      }
 	    else // TimeTableView == TT_TUT_EDIT
 	      {
                Par_PutHiddenParamString ("ModHorGrp","");
 	       /***** Place *****/
-	       fprintf (Gbl.F.Out,"<br />%s"
+	       fprintf (Gbl.F.Out,"<br />"
+		                  "<label>"
+		                  "%s"
                                   "<input type=\"text\" name=\"ModHorLugar\""
                                   " size=\"12\" maxlength=\"%u\" value=\"%s\""
-		                  " onchange=\"document.getElementById('%s').submit();\" />",
+		                  " onchange=\"document.getElementById('%s').submit();\" />"
+		                  "</label>",
 		        Txt_Place,TT_MAX_LENGTH_PLACE,Place,Gbl.Form.Id);
 	      }
 	   }