diff --git a/ChangeLog b/ChangeLog
index c4edbb549..349f8e064 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-07 02:21  Alexander Malmberg <alexander@malmberg.org>
+
+	* Source/GSString.m: (-makeImmutableCopyOnFail:): Set isa to correct
+	class.
+
 2002-11-04  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSArray.m: Ensured some documentation in place for almost all
diff --git a/Source/GSString.m b/Source/GSString.m
index 224efc5f5..f2738543f 100644
--- a/Source/GSString.m
+++ b/Source/GSString.m
@@ -2922,7 +2922,10 @@ transmute(ivars self, NSString *aString)
 
 - (id) makeImmutableCopyOnFail: (BOOL)force
 {
-  isa = [GSString class];
+  if (_flags.wide == 1)
+    isa = [GSUnicodeString class];
+  else
+    isa = [GSCString class];
   return self;
 }