diff --git a/core/control/Director.php b/core/control/Director.php
index 192b73c5a..1346e356b 100644
--- a/core/control/Director.php
+++ b/core/control/Director.php
@@ -396,8 +396,11 @@ class Director {
 		if(self::$alternateBaseURL) return self::$alternateBaseURL;
 		else {
 			$base = dirname(dirname($_SERVER['SCRIPT_NAME']));
-			if($base == '/' || $base == '/.' || $base == '\\') return '/';
-			else return $base . '/';
+			if($base == '/' || $base == '/.' || $base == '\\') $baseURL = '/';
+			else $baseURL = $base . '/';
+			
+			if(defined('BASE_SCRIPT_URL')) return $baseURL . BASE_SCRIPT_URL;
+			else return $baseURL;
 		}
 	}