diff --git a/ChangeLog b/ChangeLog
index 1d82793f4..3a608a985 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-24  Richard Frith-Macdonald <rfm@gnu.org>
+
+        * Source/NSBundle.m: Fix error spotted by Fred.
+
 2012-09-24  Richard Frith-Macdonald <rfm@gnu.org>
 
         * Headers/Foundation/NSFileHandle.h: deprecate old method for setting
diff --git a/Source/NSBundle.m b/Source/NSBundle.m
index 2cb3d69f4..3217de72d 100644
--- a/Source/NSBundle.m
+++ b/Source/NSBundle.m
@@ -123,17 +123,17 @@ altLang(NSString *full)
             }
         }
 
-      if ([canon rangeOfString: @"-"].length > 1)
+      if ((r = [canon rangeOfString: @"-"]).length > 1)
         {
           dialect = [canon substringFromIndex: NSMaxRange(r)];
           lang = [canon substringToIndex: r.location];
-          if ([dialect rangeOfString: @"_"].length > 1)
+          if ((r = [dialect rangeOfString: @"_"]).length > 1)
             {
               region = [dialect substringFromIndex: NSMaxRange(r)];
               dialect = [dialect substringToIndex: r.location];
             }
         }
-      else if ([canon rangeOfString: @"_"].length > 1)
+      else if ((r = [canon rangeOfString: @"_"]).length > 1)
         {
           region = [canon substringFromIndex: NSMaxRange(r)];
           lang = [canon substringToIndex: r.location];