diff --git a/e107_plugins/tagwords/tagwords_class.php b/e107_plugins/tagwords/tagwords_class.php
index 4f475e9fb..b024af53d 100644
--- a/e107_plugins/tagwords/tagwords_class.php
+++ b/e107_plugins/tagwords/tagwords_class.php
@@ -9,8 +9,8 @@
  * Tagwords Class
  *
  * $Source: /cvs_backup/e107_0.8/e107_plugins/tagwords/tagwords_class.php,v $
- * $Revision: 1.6 $
- * $Date: 2009-09-25 20:13:12 $
+ * $Revision: 1.7 $
+ * $Date: 2009-09-29 17:43:44 $
  * $Author: secretr $
  *
 */
@@ -37,14 +37,14 @@ class tagwords
 	/*
 	* constructor (include all e_tagwords.php files)
 	*/
-	function tagwords()
+	function __construct()
 	{
 		global $pref, $TEMPLATE_TAGWORDS, $tagwords_shortcodes;
 
 		$this->e107 = e107::getInstance();
 
 		//language
-		include_lan(e_PLUGIN."tagwords/languages/".e_LANGUAGE.".php");
+		e107::includeLan(e_PLUGIN."tagwords/languages/".e_LANGUAGE.".php");
 
 		//shortcodes
 		require_once(e_PLUGIN.'tagwords/tagwords_shortcodes.php');
diff --git a/e107_plugins/tagwords/tagwords_menu.php b/e107_plugins/tagwords/tagwords_menu.php
index 63e20562f..6b66c05a8 100644
--- a/e107_plugins/tagwords/tagwords_menu.php
+++ b/e107_plugins/tagwords/tagwords_menu.php
@@ -9,9 +9,9 @@
  * Tagwords Menu
  *
  * $Source: /cvs_backup/e107_0.8/e107_plugins/tagwords/tagwords_menu.php,v $
- * $Revision: 1.2 $
- * $Date: 2009-01-17 22:46:37 $
- * $Author: lisa_ $
+ * $Revision: 1.3 $
+ * $Date: 2009-09-29 17:43:44 $
+ * $Author: secretr $
  *
 */
 
@@ -28,7 +28,7 @@ if(varsettrue($tag->pref['tagwords_class']) && !check_class($tag->pref['tagwords
 }
 
 $text = $e107->tp->parseTemplate($tag->template['menu_cloud'], true, $tag->shortcodes);
-$caption = ($tag->pref['tagwords_menu_caption'] ? $tag->pref['tagwords_menu_caption'] : LAN_TAG_16);
+$caption = $tag->pref['tagwords_menu_caption'] ? defset($tag->pref['tagwords_menu_caption'], $tag->pref['tagwords_menu_caption']) : LAN_TAG_16;
 $e107->ns->tablerender($caption, $text);
 
 ?>
\ No newline at end of file