diff --git a/includes/locale.inc b/includes/locale.inc
index a572bc5043b797a08c5a07a3c30e92c2ac8449c5..19876577bb73b9d000ffbace1a2ee63a7260b6a4 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -178,7 +178,7 @@ function _locale_import_po($file, $lang, $mode) {
         }
         else {
           db_query("INSERT INTO {locales_source} (location, source) VALUES ('%s', '%s')", $comments, $english[$key]);
-          $lid = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE location = '%s' AND source = '%s'", $comments, $english[$key]));
+          $lid = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $english[$key]));
           $lid = $lid->lid;
         }
         if ($key == 0) {
@@ -207,7 +207,7 @@ function _locale_import_po($file, $lang, $mode) {
       }
       else {
         db_query("INSERT INTO {locales_source} (location, source) VALUES ('%s', '%s')", $comments, $english);
-        $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE location = '%s' AND source = '%s'", $comments, $english));
+        $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $english));
         $lid = $loc->lid;
       }
       if ($loc->translation && $mode == 'overwrite') {
diff --git a/modules/locale.module b/modules/locale.module
index ae6c407bdfc8b9ac2e068ddca015ce5be20db4a0..b7271481b6c0f5244a92026ffa045c62d6fd593c 100644
--- a/modules/locale.module
+++ b/modules/locale.module
@@ -179,7 +179,7 @@ function locale($string) {
       else {
         db_query("INSERT INTO {locales_source} (location, source) VALUES ('%s', '%s')", request_uri(), $string);
         if ($locale) {
-          $lid = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE location = '%s' AND source = '%s'", request_uri(), $string));
+          $lid = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $string));
           db_query("INSERT INTO {locales_target} (lid, locale) VALUES (%d, '%s')", $lid->lid, $locale);
         }
       }
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index ae6c407bdfc8b9ac2e068ddca015ce5be20db4a0..b7271481b6c0f5244a92026ffa045c62d6fd593c 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -179,7 +179,7 @@ function locale($string) {
       else {
         db_query("INSERT INTO {locales_source} (location, source) VALUES ('%s', '%s')", request_uri(), $string);
         if ($locale) {
-          $lid = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE location = '%s' AND source = '%s'", request_uri(), $string));
+          $lid = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $string));
           db_query("INSERT INTO {locales_target} (lid, locale) VALUES (%d, '%s')", $lid->lid, $locale);
         }
       }