--- i18n.module.orig	2005-12-01 20:02:40.000000000 -0500
+++ i18n.module	2006-03-07 13:08:10.902939357 -0500
@@ -211,17 +211,18 @@
  */
 function i18n_get_normal_path($path) {
   // First, check alias with lang
-  if (($map = drupal_get_path_map()) && isset($map[$path])) {
-    return $map[$path];
+  $result = $path;
+  if ($src = drupal_lookup_path('source', $path)) {
+    $result = $src;
   } elseif ($lang = i18n_get_lang_prefix($path, true)) {
     // Check alias without lang
     //$path = trim(substr($path, strlen($lang)),'/');
-    if( isset($map[$path])) {
-      return $map[$path];
-    } 
+    if (function_exists('custom_url_rewrite')) {
+      $result = custom_url_rewrite('alias', $result, $path);
+     }
   } 
   // We only get here when no alias is defined, with or without lang
-  return $path;
+  return $result;
 }
 
 /**
@@ -330,4 +331,4 @@
     
   );
 }
-?>
\ No newline at end of file
+?>