diff --git a/www/sites/all/modules/domain/domain.module b/www/sites/all/modules/domain/domain.module
index 6381a07..6102500 100644
--- a/www/sites/all/modules/domain/domain.module
+++ b/www/sites/all/modules/domain/domain.module
@@ -1344,12 +1344,14 @@ function domain_get_uri($domain) {
   $modules = _domain_path_modules();
   if (!empty($modules) && !drupal_is_front_page()) {
     // If needed, let modules modify the path alias.
-    $options = array();
-    $alias = domain_path($domain['domain_id'], $_GET['q'], $options, $_GET['q']);
+    $request_uri = trim($request_uri, '/');
+    // We cannot use URL here because we need the domain_id data.
+    // TODO: use url() but pass a domain_id option?
+    domain_path($domain['domain_id'], $request_uri, $options, $request_uri);
     // Run the result through url() for proper language and path handling.
-    $request_uri = url($alias);
+    # $request_uri = url($request_uri, $options);
+    $request_uri = '/' . trim($request_uri, '/');
   }
-
   $path = check_url($domain['scheme'] . '://' . $domain['subdomain'] . $request_uri);
   return $path;
 }