diff --git a/td/generate/DotnetTlDocumentationGenerator.php b/td/generate/DotnetTlDocumentationGenerator.php
index db53cc1ea..9772fb450 100644
--- a/td/generate/DotnetTlDocumentationGenerator.php
+++ b/td/generate/DotnetTlDocumentationGenerator.php
@@ -158,13 +158,16 @@ EOT
 );
     }
 
-    protected function addClassDocumentation($class_name, $base_class_name, $description, $return_type)
+    protected function getFunctionReturnTypeDescription($return_type)
     {
-        $return_type_description = $return_type ? "\r\n/// <para>Returns <see cref=\"".substr($return_type, 0, -1).'"/>.</para>' : '';
+        return "\r\n/// <para>Returns <see cref=\"".substr($return_type, 0, -1).'"/>.</para>';
+    }
 
+    protected function addClassDocumentation($class_name, $base_class_name, $description)
+    {
         $this->addDocumentation("public ref class $class_name sealed : $base_class_name {", <<<EOT
 /// <summary>
-/// $description$return_type_description
+/// $description
 /// </summary>
 EOT
 );
diff --git a/td/generate/DoxygenTlDocumentationGenerator.php b/td/generate/DoxygenTlDocumentationGenerator.php
index 775ee871a..d8f25c302 100644
--- a/td/generate/DoxygenTlDocumentationGenerator.php
+++ b/td/generate/DoxygenTlDocumentationGenerator.php
@@ -321,13 +321,16 @@ EOT
 );
     }
 
-    protected function addClassDocumentation($class_name, $base_class_name, $description, $return_type)
+    protected function getFunctionReturnTypeDescription($return_type)
     {
-        $return_type_description = $return_type ? PHP_EOL.' *'.PHP_EOL." * Returns $return_type." : '';
+        return PHP_EOL.' *'.PHP_EOL." * Returns $return_type.";
+    }
 
+    protected function addClassDocumentation($class_name, $base_class_name, $description)
+    {
         $this->addDocumentation("class $class_name final : public $base_class_name {", <<<EOT
 /**
- * $description$return_type_description
+ * $description
  */
 EOT
 );
diff --git a/td/generate/JavadocTlDocumentationGenerator.php b/td/generate/JavadocTlDocumentationGenerator.php
index 99fea2271..a5d74266c 100644
--- a/td/generate/JavadocTlDocumentationGenerator.php
+++ b/td/generate/JavadocTlDocumentationGenerator.php
@@ -190,13 +190,16 @@ EOT
 );
     }
 
-    protected function addClassDocumentation($class_name, $base_class_name, $description, $return_type)
+    protected function getFunctionReturnTypeDescription($return_type)
     {
-        $return_type_description = $return_type ? PHP_EOL.'     *'.PHP_EOL."     * <p> Returns {@link $return_type $return_type} </p>" : '';
+        return PHP_EOL.'     *'.PHP_EOL."     * <p> Returns {@link $return_type $return_type} </p>";
+    }
 
+    protected function addClassDocumentation($class_name, $base_class_name, $description)
+    {
         $this->addDocumentation("    public static class $class_name extends $base_class_name {", <<<EOT
     /**
-     * $description$return_type_description
+     * $description
      */
 EOT
 );
diff --git a/td/generate/TlDocumentationGenerator.php b/td/generate/TlDocumentationGenerator.php
index fd4c7a758..73522cf46 100644
--- a/td/generate/TlDocumentationGenerator.php
+++ b/td/generate/TlDocumentationGenerator.php
@@ -87,7 +87,9 @@ abstract class TlDocumentationGenerator
 
     abstract protected function addAbstractClassDocumentation($class_name, $value);
 
-    abstract protected function addClassDocumentation($class_name, $base_class_name, $description, $return_type);
+    abstract protected function getFunctionReturnTypeDescription($return_type);
+
+    abstract protected function addClassDocumentation($class_name, $base_class_name, $description);
 
     abstract protected function addFieldDocumentation($class_name, $field_name, $type_name, $field_info, $may_be_null);
 
@@ -233,7 +235,11 @@ abstract class TlDocumentationGenerator
                 }
 
                 $base_class_name = $current_class ?: $this->getBaseClassName($is_function);
-                $this->addClassDocumentation($class_name, $base_class_name, $info['description'], $is_function ? $this->getTypeName($type) : '');
+                $class_description = $info['description'];
+                if ($is_function) {
+                    $class_description .= $this->getFunctionReturnTypeDescription($this->getTypeName($type));
+                }
+                $this->addClassDocumentation($class_name, $base_class_name, $class_description);
 
                 foreach ($known_fields as $name => $type) {
                     $may_be_null = stripos($info[$name], 'may be null') !== false;