diff --git a/modules/cms/classes/CmsObject.php b/modules/cms/classes/CmsObject.php
index e1ce32727..04d96237c 100644
--- a/modules/cms/classes/CmsObject.php
+++ b/modules/cms/classes/CmsObject.php
@@ -109,7 +109,7 @@ public static function load($theme, $fileName)
      * This method is used by the CMS in the runtime. If the cache is not found, it is created.
      * @param \Cms\Classes\Theme $theme Specifies the theme the object belongs to.
      * @param string $fileName Specifies the file name, with the extension.
-     * @return mixed Returns a CMS object instance or null if the object wasn't found.
+     * @return static|null Returns a CMS object instance or null if the object wasn't found.
      */
     public static function loadCached($theme, $fileName)
     {
@@ -185,7 +185,7 @@ public static function listInTheme($theme, $skipCache = false)
     /**
      * Prepares the theme datasource for the model.
      * @param \Cms\Classes\Theme $theme Specifies a parent theme.
-     * @return $this
+     * @return static
      */
     public static function inTheme($theme)
     {