diff --git a/packages/rtl/classes.pas b/packages/rtl/classes.pas
index a6cdbab..1925662 100644
--- a/packages/rtl/classes.pas
+++ b/packages/rtl/classes.pas
@@ -1554,16 +1554,18 @@ Var
   B : TBytes;
   Buf : TJSArrayBuffer;
   BytesLeft : Integer;
+  ByteCount : Integer;
 
 begin
   // Top off
+  ByteCount:=Count*2; // UTF-16
   BytesLeft:=(Size-Position);
-  if BytesLeft<Count then
-    Count:=BytesLeft;
-  SetLength(B,Count);
-  ReadBuffer(B,0,Count);
+  if BytesLeft<ByteCount then
+    ByteCount:=BytesLeft;
+  SetLength(B,ByteCount);
+  ReadBuffer(B,0,ByteCount);
   Buf:=BytesToMemory(B);
-  Result:=BufferToString(Buf,0,Count);
+  Result:=BufferToString(Buf,0,ByteCount);
 end;
 
 procedure TStringStream.WriteString(const AString: string);
diff --git a/test/testrtl.html b/test/index.html
similarity index 100%
rename from test/testrtl.html
rename to test/index.html
diff --git a/test/tcstream.pp b/test/tcstream.pp
index 4cb7d50..c74bbed 100644
--- a/test/tcstream.pp
+++ b/test/tcstream.pp
@@ -167,11 +167,16 @@ procedure TTestStringStream.TestReadString;
 Var
   S : String;
 
+
 begin
   S:='ABCDEFGH';
   DoCreate(S);
-  AssertEquals('2 characters','AB',Stream.ReadString(4));
-  AssertEquals('Top off characters','CDEFGH',Stream.ReadString(22));
+  AssertEquals('2 characters','AB',Stream.ReadString(2));
+  AssertEquals('Top off characters','CDEFGH',Stream.ReadString(11));
+  S:='Hello World';
+  FreeAndNil(FStream);
+  DoCreate(S);
+  AssertEquals('Correct string',S,Stream.ReadString(Length(S)));
 end;
 
 procedure TTestStringStream.TestWriteString;
diff --git a/test/testrtl.lpi b/test/testrtl.lpi
index bb3d815..90b78d0 100644
--- a/test/testrtl.lpi
+++ b/test/testrtl.lpi
@@ -38,7 +38,7 @@
         <IsPartOfProject Value="True"/>
       </Unit>
       <Unit>
-        <Filename Value="testrtl.html"/>
+        <Filename Value="index.html"/>
         <IsPartOfProject Value="True"/>
         <CustomData Count="1">
           <Item0 Name="PasJSIsProjectHTMLFile" Value="1"/>
diff --git a/test/testrtl.lpr b/test/testrtl.lpr
index 84fcde2..4d92f47 100644
--- a/test/testrtl.lpr
+++ b/test/testrtl.lpr
@@ -26,7 +26,7 @@ program testrtl;
 
 uses
   browserconsole, consoletestrunner, frmrtlrun, simplelinkedlist,
-//  tcstream,
+  tcstream,
 // tccompstreaming,
 //  tcsyshelpers,
 //  tcgenarrayhelper,