diff --git a/fcl/db/dataset.inc b/fcl/db/dataset.inc
index bac531bfb5..44f85e09e1 100644
--- a/fcl/db/dataset.inc
+++ b/fcl/db/dataset.inc
@@ -877,6 +877,8 @@ begin
   Writeln('Getting next buffers');
 {$endif}
   GetNextRecords;
+  if FRecordCount < FBufferCount then
+    GetPriorRecords;
 {$Ifdef dsDebug}
   WriteLn(
     'SetBufferCount: FActiveRecord=',FActiveRecord,