diff --git a/e107_handlers/shortcode_handler.php b/e107_handlers/shortcode_handler.php
index 20d5e7f99..8d70ec2cf 100644
--- a/e107_handlers/shortcode_handler.php
+++ b/e107_handlers/shortcode_handler.php
@@ -288,6 +288,7 @@ class e_parse_shortcode
 		elseif($pluginName)
 		{
 			$_class = 'plugin_'.$pluginName.'_'.$className;
+			$className = $_class;
 		}
 		
 		$path = ($pluginName ? e_PLUGIN.$pluginName.'/core/shortcodes/batch/' : e_CORE.'shortcodes/batch/').$_class_fname.'.php';