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