Index: src/natools-s_expressions-atom_buffers.adb
==================================================================
--- src/natools-s_expressions-atom_buffers.adb
+++ src/natools-s_expressions-atom_buffers.adb
@@ -85,11 +85,11 @@
    begin
       if Buffer.Ref.Is_Empty then
          pragma Assert (Buffer.Available = 0 and Buffer.Used = 0);
          return Null_Atom;
       else
-         return Buffer.Ref.Query.Data.all;
+         return Buffer.Ref.Query.Data.all (1 .. Buffer.Used);
       end if;
    end Data;
 
 
    function Raw_Query (Buffer : Atom_Buffer) return Atom_Refs.Accessor is
@@ -113,11 +113,11 @@
       Process : not null access procedure (Data : in Atom)) is
    begin
       if Buffer.Ref.Is_Empty then
          Process.all (Null_Atom);
       else
-         Buffer.Ref.Query (Process);
+         Process.all (Buffer.Ref.Query.Data.all (1 .. Buffer.Used));
       end if;
    end Query;
 
 
    procedure Read