diff --git a/src/command_type.h b/src/command_type.h
--- a/src/command_type.h
+++ b/src/command_type.h
@@ -382,12 +382,12 @@ typedef void CommandCallback(const Comma
  * Structure for buffering the build command when selecting a station to join.
  */
 struct CommandContainer {
-	TileIndex tile;            ///< tile command being executed on
-	uint32 p1;                 ///< parameter p1
-	uint32 p2;                 ///< parameter p2
-	uint32 cmd;                ///< command being executed
-	CommandCallback *callback; ///< any callback function executed upon successful completion of the command
-	char text[80];             ///< possible text sent for name changes etc
+	TileIndex tile;                  ///< tile command being executed on.
+	uint32 p1;                       ///< parameter p1.
+	uint32 p2;                       ///< parameter p2.
+	uint32 cmd;                      ///< command being executed.
+	CommandCallback *callback;       ///< any callback function executed upon successful completion of the command.
+	char text[32 * MAX_CHAR_LENGTH]; ///< possible text sent for name changes etc, in bytes including '\0'.
 };
 
 #endif /* COMMAND_TYPE_H */