diff --git a/e107_files/shortcode/batch/news_shortcodes.php b/e107_files/shortcode/batch/news_shortcodes.php
index 7f48dd0c4..c91f26ed4 100644
--- a/e107_files/shortcode/batch/news_shortcodes.php
+++ b/e107_files/shortcode/batch/news_shortcodes.php
@@ -1,7 +1,7 @@
 <?php
 /*
 * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
-* $Id: news_shortcodes.php,v 1.22 2009-07-21 06:31:23 e107coders Exp $
+* $Id: news_shortcodes.php,v 1.23 2009-07-21 10:21:20 marj_nl_fr Exp $
 *
 * News shortcode batch
 */
@@ -19,6 +19,7 @@ $codes = array(
 */
 
 $codes = array();
+/*
 $tmp = get_class_methods('news_shortcodes');
 foreach($tmp as $c)
 {
@@ -28,8 +29,8 @@ foreach($tmp as $c)
 	}
 }
 unset($tmp);
-
-register_shortcode('news_shortcodes', $codes);
+*/
+register_shortcode('news_shortcodes', TRUE);
 initShortcodeClass('news_shortcodes');
 
 class news_shortcodes
diff --git a/e107_plugins/tagwords/tagwords_shortcodes.php b/e107_plugins/tagwords/tagwords_shortcodes.php
index ed3842480..cb76caad8 100644
--- a/e107_plugins/tagwords/tagwords_shortcodes.php
+++ b/e107_plugins/tagwords/tagwords_shortcodes.php
@@ -9,9 +9,9 @@
  * Tagwords Shortcodes
  *
  * $Source: /cvs_backup/e107_0.8/e107_plugins/tagwords/tagwords_shortcodes.php,v $
- * $Revision: 1.5 $
- * $Date: 2009-07-21 08:27:23 $
- * $Author: e107coders $
+ * $Revision: 1.6 $
+ * $Date: 2009-07-21 10:21:20 $
+ * $Author: marj_nl_fr $
  *
 */
 if (!defined('e107_INIT')) { exit; }
@@ -23,6 +23,7 @@ $codes = array(
 */
 
 $codes = array();
+/*
 $tmp = get_class_methods('tagwords_shortcodes');
 foreach($tmp as $c)
 {
@@ -31,7 +32,8 @@ foreach($tmp as $c)
 		$codes[] = substr($c, 3);
 	}
 }
-register_shortcode('tagwords_shortcodes', $codes);
+*/
+register_shortcode('tagwords_shortcodes', TRUE);
 
 initShortcodeClass('tagwords_shortcodes');