diff --git a/classes/ComicPressRelatedPosts.inc b/classes/ComicPressRelatedPosts.inc
index 5c24449..ffe99ea 100644
--- a/classes/ComicPressRelatedPosts.inc
+++ b/classes/ComicPressRelatedPosts.inc
@@ -44,7 +44,7 @@ class ComicPressRelatedPosts {
 	function _handle_shortcode_attrs($attrs) {
 		return shortcode_atts(array(
 			'limit' => '5',
-		), $atts);
+		), $attrs);
 	}
 
 	function _new_comicpressstoryline() { return new ComicPressStoryline(); }
diff --git a/functions.php b/functions.php
index 2b9f231..0a58526 100644
--- a/functions.php
+++ b/functions.php
@@ -1,5 +1,7 @@
 <?php
 
+global $comicpress_options;
+
 // the_post_thumbnail('thumbnail/medium/full');
 if (function_exists('add_theme_support')) {
 	add_theme_support( 'post-thumbnails' );
@@ -44,6 +46,7 @@ function __comicpress_init() {
 	global $comicpress_options, $__comicpress_handlable_classes;
 
 	$comicpress_options = array();
+	
 	// Check if the $comicpress_options exist, if not set defaults
 	$comicpress_options = comicpress_load_options();
 	// xili-language plugin check
@@ -122,6 +125,8 @@ if (!empty($wpmu_version)) {
 
 function comicpress_load_options() {
 	global $comicpress_options;
+
+	
 	$comicpress_options = get_option('comicpress_options');
 	if (empty($comicpress_options)) {
 		$comicpress_options['comicpress_version'] = '2.9.0.9';
diff --git a/functions/syndication.php b/functions/syndication.php
index f8668b4..d6b76db 100644
--- a/functions/syndication.php
+++ b/functions/syndication.php
@@ -86,5 +86,8 @@ function comicpress_export_wp() {
 	remove_filter('the_title_rss', 'comicpress_the_title_rss');
 }
 
-add_filter('the_title_rss', 'comicpress_the_title_rss');
-add_action('export_wp', 'comicpress_export_wp');
+global $comicpress_options;
+if ($comicpress_options['enable_comment_count_in_rss']) {
+	add_filter('the_title_rss', 'comicpress_the_title_rss');
+	add_action('export_wp', 'comicpress_export_wp');
+}