diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 88b34cc2b..2e3edefec 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -1839,6 +1839,11 @@ class e_parse extends e_parser
 		{
 			parse_str($options, $options);
 		}
+		
+		if(strstr($url,e_MEDIA) || strstr($url,e_SYSTEM)) // prevent disclosure of 'hashed' path. 
+		{
+			$raw = true; 	
+		}
 
 		if($raw) $url = $this->createConstants($url, 'mix');