diff --git a/components/rx/trunk/rxdb/rxdbutils.pas b/components/rx/trunk/rxdb/rxdbutils.pas
index d10e89756..b65794d2f 100644
--- a/components/rx/trunk/rxdb/rxdbutils.pas
+++ b/components/rx/trunk/rxdb/rxdbutils.pas
@@ -458,7 +458,8 @@ var
   Bookmark: TBookmark;
 begin
   Result := False;
-  with DataSet do begin
+  with DataSet do
+  begin
     CheckBrowseMode;
     if BOF and EOF then Exit;
   end;
@@ -470,7 +471,11 @@ begin
     if SearchOrigin = rsdAll then
     begin
       Result := CompareRecord;
-      if Result then Exit;
+      if Result then
+      begin
+        Fields.Free;
+        Exit;
+      end;
     end;
 
     DataSet.DisableControls;