diff --git a/js/menu.js b/js/menu.js
index a2b4ce5..cb19684 100755
--- a/js/menu.js
+++ b/js/menu.js
@@ -1,12 +1,11 @@
 (function($){
   $(document).ready(function(){
     var menu_element = Drupal.settings.single_page.menu_element;
-    var basePath = Drupal.settings.basePath;
-    var pathPrefix = Drupal.settings.pathPrefix;
+    var prefix = Drupal.settings.basePath + Drupal.settings.pathPrefix;
     $(menu_element+" a").each(function(index) {
-      var anchor = this.href.replace(window.location, "");
-      anchor = anchor.replace(/\//gi, "-");
-      this.href = basePath + pathPrefix + "#" + anchor;
+      var a = $("<a>", { href:this.href } )[0];
+      var anchor = a.pathname.substr(prefix.length).replace(/\//gi, "-");
+      this.href = prefix + "#" + anchor;
     });
   });
-})(jQuery);
+}) (jQuery);
diff --git a/single_page_website.module b/single_page_website.module
index cec3e68..ac07783 100755
--- a/single_page_website.module
+++ b/single_page_website.module
@@ -108,8 +108,8 @@ function single_page_website_front_page() {
         drupal_set_message(t('Your menu contains a link to "front". You should remove this %item from your !menu.', array('%item' => $item['#title'], '!menu' => l($menu_name, 'admin/structure/menu/manage/' . $menu_name))));
         continue;
       }
-    $anchor = drupal_get_path_alias($href);
-    $anchor = str_replace('/', '-', $anchor);
+      $anchor = drupal_get_path_alias($href);
+      $anchor = str_replace('/', '-', $anchor);
       $output .= '<a name="' . $anchor . '"></a><div id="' . $anchor . '" class="single_page_wrapper"><div class="single_page">';
 
       // Set the q to ... required to get the block system working