diff --git a/e107_handlers/application.php b/e107_handlers/application.php
index da06797f2..5e18501d1 100644
--- a/e107_handlers/application.php
+++ b/e107_handlers/application.php
@@ -388,7 +388,7 @@ class eDispatcher
 				//if($custom) $custom = 'url/'.$custom;
 				if(!defined('e_CURRENT_PLUGIN'))
 				{
-					define('e_CURRENT_PLUGIN', $module); // TODO Move to a better location.
+					define('e_CURRENT_PLUGIN', rtrim($module,'/')); // TODO Move to a better location.
 				}
 				return $sc ? '{e_PLUGIN}'.$module.'url/'.$custom.'url.php' : e_PLUGIN.$module.'url/'.$custom.'url.php';
 			break;
diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 8d2c5cbbe..9a6c50d40 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -3893,7 +3893,7 @@ class e107
 		{
 			$temp = substr($e107Path, strpos($e107Path, '/') +1);
 			$plugDir = substr($temp, 0, strpos($temp, '/'));
-			define('e_CURRENT_PLUGIN', $plugDir);
+			define('e_CURRENT_PLUGIN', rtrim($plugDir,'/'));
 			define('e_PLUGIN_DIR', e_PLUGIN.e_CURRENT_PLUGIN.'/');
 			define('e_PLUGIN_DIR_ABS', e_PLUGIN_ABS.e_CURRENT_PLUGIN.'/');
 		}