--- a/CharacterWriteStream.st	Mon Aug 26 10:08:16 2019 +0200
+++ b/CharacterWriteStream.st	Mon Aug 26 10:08:33 2019 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2005 by eXept Software AG
               All Rights Reserved
@@ -210,7 +212,7 @@
                         __INST(readLimit) = __mkSmallInteger(pos);
                     }
                     __INST(position) = __mkSmallInteger(__intVal(__INST(position)) + 1);
-                    RETURN ( aCharacter );
+                    RETURN ( self );
                 }
             } else if (cls == @global(Unicode16String)) {
                 if (ch > 0xFFFF) {
@@ -222,7 +224,7 @@
                         __INST(readLimit) = __mkSmallInteger(pos);
                     }
                     __INST(position) = __mkSmallInteger(__intVal(__INST(position)) + 1);
-                    RETURN ( aCharacter );
+                    RETURN ( self );
                 }
             } else if (cls == @global(Unicode32String)) {
                 if ((pos <= __unicode32StringSize(coll))) {
@@ -231,7 +233,7 @@
                         __INST(readLimit) = __mkSmallInteger(pos);
                     }
                     __INST(position) = __mkSmallInteger(__intVal(__INST(position)) + 1);
-                    RETURN ( aCharacter );
+                    RETURN ( self );
                 }
             }
         }
@@ -257,7 +259,6 @@
     ] ifFalse:[
         WriteError raiseErrorString:'write beyond writeLimit'
     ].
-    ^ aCharacter
 !
 
 nextPutAll:aCollection
@@ -298,11 +299,11 @@
 !
 
 nextPutAllUnicode:aCollection
-    ^ self nextPutAll:aCollection
+    self nextPutAll:aCollection
 !
 
 nextPutUnicode:aCharacter
-    ^ self nextPut:aCharacter
+    self nextPut:aCharacter
 ! !
 
 !CharacterWriteStream class methodsFor:'documentation'!