diff --git a/Source/NSCharacterSet.m b/Source/NSCharacterSet.m
index 0262f75c8..eaff7a457 100644
--- a/Source/NSCharacterSet.m
+++ b/Source/NSCharacterSet.m
@@ -63,6 +63,7 @@ static NSLock* cache_lock = nil;
 {
   NSCharacterSet* set;
   NSString *path;
+  id csb;
 
   if (!cache_lock)
     cache_lock = [NSLock new];
@@ -70,15 +71,16 @@ static NSLock* cache_lock = nil;
 
   set = nil; /* Quiet warnings */
   if (cache_set[number] == nil)
-    {
-      NS_DURING
-	path = [NSBundle pathForResource:setname
+      NS_DURING {
+        csb = [NSBundle bundleWithPath:NSCharacterSet_PATH];
+	path = [csb pathForResource:setname
 			ofType:@"dat"
 			inDirectory:NSCharacterSet_PATH];
         /* This is for testing purposes */
         if (path == nil || [path length] == 0)
-	  {
-	    path = [NSBundle pathForResource:setname
+          }
+        csb = [NSBundle bundleWithPath:@"../NSCharacterSets"];
+	    path = [csb pathForResource:setname
 			ofType:@"dat"
 			inDirectory:@"../NSCharacterSets"];
 	  }