diff --git a/core/i18n.php b/core/i18n.php
index 879f7e299..adcb3339f 100755
--- a/core/i18n.php
+++ b/core/i18n.php
@@ -937,6 +937,7 @@ class i18n extends Controller {
 			ereg('/([^/]+)/',$path,$module);
 		} else {
 			global $_CLASS_MANIFEST;
+			if(strpos($name,'_') !== false) $name = strtok($name,'_');
 			$path = str_replace('\\','/',Director::makeRelative($_CLASS_MANIFEST[$name]));
 			ereg('/([^/]+)/', $path, $module);
 		}