diff --git a/Source/Stream.m b/Source/Stream.m
index 0c5439438..7821fbeba 100644
--- a/Source/Stream.m
+++ b/Source/Stream.m
@@ -101,7 +101,10 @@ NSString* StreamException = @"StreamException";
 {
   char *l;
   [self readFormat: @"%a[^\n]\n", &l];
-  return [NSString stringWithCStringNoCopy:l];
+  return [[[NSString alloc] initWithCStringNoCopy: l
+			    length: strlen (l)
+			    freeWhenDone: YES]
+	   autorelease];
 }
 
 - (void) flushStream