diff --git a/swad_centre.c b/swad_centre.c
index 9b608d0c1..6100f5318 100644
--- a/swad_centre.c
+++ b/swad_centre.c
@@ -1786,7 +1786,7 @@ static bool Ctr_RenameCentre (struct Centre *Ctr,Cns_ShortOrFullName_t ShortOrFu
    extern const char *Txt_The_centre_X_already_exists;
    extern const char *Txt_The_centre_X_has_been_renamed_as_Y;
    extern const char *Txt_The_name_of_the_centre_X_has_not_changed;
-   char Query[512];
+   char Query[128+Ctr_MAX_LENGTH_CENTRE_FULL_NAME];
    const char *ParamName = NULL;	// Initialized to avoid warning
    const char *FieldName = NULL;	// Initialized to avoid warning
    unsigned MaxLength = 0;		// Initialized to avoid warning
@@ -1872,7 +1872,7 @@ static bool Ctr_RenameCentre (struct Centre *Ctr,Cns_ShortOrFullName_t ShortOrFu
 
 static bool Ctr_CheckIfCtrNameExistsInIns (const char *FieldName,const char *Name,long CtrCod,long InsCod)
   {
-   char Query[512];
+   char Query[256+Ctr_MAX_LENGTH_CENTRE_FULL_NAME];
 
    /***** Get number of centres with a name from database *****/
    sprintf (Query,"SELECT COUNT(*) FROM centres"
@@ -2589,7 +2589,10 @@ static void Ctr_RecFormRequestOrCreateCtr (unsigned Status)
 static void Ctr_CreateCentre (struct Centre *Ctr,unsigned Status)
   {
    extern const char *Txt_Created_new_centre_X;
-   char Query[1024];
+   char Query[512+
+              Ctr_MAX_LENGTH_CENTRE_SHORT_NAME+
+              Ctr_MAX_LENGTH_CENTRE_FULL_NAME+
+              Cns_MAX_LENGTH_WWW];
 
    /***** Create a new centre *****/
    sprintf (Query,"INSERT INTO centres (InsCod,PlcCod,Status,RequesterUsrCod,"
diff --git a/swad_changelog.h b/swad_changelog.h
index cd34e7952..c0668e01a 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -150,13 +150,14 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 16.31.1 (2016-10-22)"
+#define Log_PLATFORM_VERSION	"SWAD 16.31.2 (2016-10-22)"
 #define CSS_FILE		"swad16.25.css"
 #define JS_FILE			"swad15.238.1.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.31.2:  Oct 22, 2016	Code refactoring in renaming of centre. (205108 lines)
         Version 16.31.1:  Oct 22, 2016	Code optimization in renaming of institution. (205104 lines)
         Version 16.31:    Oct 22, 2016	New form in institution configuration to change full name. (205097 lines)
 					1 change necessary in database: