diff --git a/core/alex.php b/core/alex.php
deleted file mode 100644
index ad0145b..0000000
--- a/core/alex.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-var_dump($_SERVER);
diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php
index 4503638..c49952a 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -200,14 +200,14 @@ public function generateFromRoute($name, $parameters = array(), $options = array
    * {@inheritdoc}
    */
   public function generateFromPath($path = NULL, $options = array()) {
-
-    $current_base_path = $this->requestStack->getCurrentRequest()->getBasePath() . '/';
-    $current_base_url = $this->requestStack->getCurrentRequest()->getSchemeAndHttpHost() . $current_base_path;
-    $current_script_path = '';
     $request = $this->requestStack->getCurrentRequest();
-    if (!empty($current_base_url)) {
+    $current_base_path = $request->getBasePath() . '/';
+    $current_base_url = $request->getSchemeAndHttpHost() . $current_base_path;
+    $current_script_path = '';
+    $base_path_with_script = $request->getBaseUrl();
+    if (!empty($base_path_with_script)) {
       $script_name = $request->getScriptName();
-      if (strpos($current_base_url, $script_name) !== FALSE) {
+      if (strpos($base_path_with_script, $script_name) !== FALSE) {
         $current_script_path = ltrim(substr($script_name, strlen($current_base_path)), '/') . '/';
       }
     }