diff --git a/components/virtualtreeview-new/trunk/VirtualTrees.pas b/components/virtualtreeview-new/trunk/VirtualTrees.pas
index aed0c12a3..96e367dd8 100644
--- a/components/virtualtreeview-new/trunk/VirtualTrees.pas
+++ b/components/virtualtreeview-new/trunk/VirtualTrees.pas
@@ -4740,10 +4740,9 @@ begin
     end;
   end;
 
-  Len := Length(Result);
-  //todo: test
-  if Result[Len - Length(LineEnding) + 1] = LineEnding[1] then
-    SetLength(Result, Len - 1);
+  Len := Length(Result) - Length(LineEnding);
+  if StrLComp(PChar(@Result[Len + 1]), PChar(@LineEnding[1]), Length(LineEnding)) = 0 then
+    SetLength(Result, Len);
 end;
 
 //----------------------------------------------------------------------------------------------------------------------