diff --git a/components/rx/trunk/languages/rxdconst.es.po b/components/rx/trunk/languages/rxdconst.es.po
index 02355667e..24b967130 100644
--- a/components/rx/trunk/languages/rxdconst.es.po
+++ b/components/rx/trunk/languages/rxdconst.es.po
@@ -75,8 +75,8 @@ msgstr "Campo '%s' no usado en expresión de filtro"
 
 #: rxdconst.sexprbadnulltest
 #, fuzzy
-#| msgid "NULL-values enabled in '=' и '<>'"
-msgid "NULL-values enabled in '=' и '<>'"
+#| msgid "NULL-values enabled in '=' и '<>'"
+msgid "NULL-values enabled in '=' и '<>'"
 msgstr "Valor nulo habilitado en '=' y '<>'"
 
 #: rxdconst.sexprexpected
diff --git a/components/rx/trunk/languages/rxdconst.po b/components/rx/trunk/languages/rxdconst.po
index d1d1df4f9..65236678f 100644
--- a/components/rx/trunk/languages/rxdconst.po
+++ b/components/rx/trunk/languages/rxdconst.po
@@ -74,7 +74,7 @@ msgid "Field '%s' not used in filter expression"
 msgstr ""
 
 #: rxdconst.sexprbadnulltest
-msgid "NULL-values enabled in '=' и '<>'"
+msgid "NULL-values enabled in '=' и '<>'"
 msgstr ""
 
 #: rxdconst.sexprexpected
diff --git a/components/rx/trunk/languages/rxdconst.ru.po b/components/rx/trunk/languages/rxdconst.ru.po
index bfe3c79db..5e5b697a8 100644
--- a/components/rx/trunk/languages/rxdconst.ru.po
+++ b/components/rx/trunk/languages/rxdconst.ru.po
@@ -75,8 +75,8 @@ msgstr "Поле '%s' не может быть использовано в вы
 
 #: rxdconst.sexprbadnulltest
 #, fuzzy
-#| msgid "NULL-values enabled in '=' и '<>'"
-msgid "NULL-values enabled in '=' и '<>'"
+#| msgid "NULL-values enabled in '=' и '<>'"
+msgid "NULL-values enabled in '=' и '<>'"
 msgstr "NULL-значения разрешены только в выражениях '=' и '<>'"
 
 #: rxdconst.sexprexpected
diff --git a/components/rx/trunk/languages/rxdconst.uk.po b/components/rx/trunk/languages/rxdconst.uk.po
index 9f1dd6381..4fde60bdb 100644
--- a/components/rx/trunk/languages/rxdconst.uk.po
+++ b/components/rx/trunk/languages/rxdconst.uk.po
@@ -84,8 +84,8 @@ msgstr "Поле '%s' не може бути використане в вира
 
 #: rxdconst.sexprbadnulltest
 #, fuzzy
-#| msgid "NULL-values enabled in '=' и '<>'"
-msgid "NULL-values enabled in '=' и '<>'"
+#| msgid "NULL-values enabled in '=' и '<>'"
+msgid "NULL-values enabled in '=' и '<>'"
 msgstr "NULL-значення дозволені тільки у виразах '=' і '<>'"
 
 #: rxdconst.sexprexpected
diff --git a/components/rx/trunk/rxdbgrid.pas b/components/rx/trunk/rxdbgrid.pas
index 35ae7e09a..ae2590bc5 100644
--- a/components/rx/trunk/rxdbgrid.pas
+++ b/components/rx/trunk/rxdbgrid.pas
@@ -4044,11 +4044,12 @@ end;
 
 procedure TRxDBGrid.CalcStatTotals;
 var
+  {$IFDEF NoAutomatedBookmark}
+  P_26: TBookmark;
+  {$ENDIF}
   P: TBookmark;
-  //DS: TDataSet;
   i, cnt: integer;
   APresent: boolean;
-  //SEA, SEB:TDataSetNotifyEvent;
 
   DHL:THackDataLink;
   DHS:THackDataSet;
@@ -4079,45 +4080,6 @@ begin
 
   Inc(FInProcessCalc);
 
-  (*
-  if Assigned(FSortEngine) and (FSortEngine.EnabledFooterRowsCalc) then
-  begin
-    for i := 0 to Columns.Count - 1 do
-      TRxColumn(Columns[i]).Footer.ResetTestValue;
-
-    FSortEngine.UpdateFooterRows(DataSource.DataSet, Self);
-
-    exit;
-  end;
-
-  DS := DataSource.DataSet;
-  ;
-  P := Ds.GetBookMark;
-  DS.DisableControls;
-  SEB:=DS.BeforeScroll;
-  SEA:=DS.AfterScroll;
-  DS.BeforeScroll:=nil;
-  DS.AfterScroll:=nil;
-  try
-    DS.First;
-    for i := 0 to Columns.Count - 1 do
-      TRxColumn(Columns[i]).Footer.ResetTestValue;
-
-    while not DS.EOF do
-    begin
-      for i := 0 to Columns.Count - 1 do
-        TRxColumn(Columns[i]).Footer.UpdateTestValue;
-      DS.Next;
-    end;
-  finally
-    DS.GotoBookmark(P);
-    DS.FreeBookmark(P);
-    DS.BeforeScroll:=SEB;
-    DS.AfterScroll:=SEA;
-    DS.EnableControls;
-  end;
-*)
-
   cnt:=0;
   for i := 0 to Columns.Count - 1 do
     TRxColumn(Columns[i]).Footer.ResetTestValue;
@@ -4184,19 +4146,18 @@ begin
   DHS.AfterScroll  := SaveAfterScroll;
   DHS.BeforeScroll := SaveBeforeScroll;
 
-  if DHS.CompareBookmarks(DHS.Bookmark, P)<>0 then
-  begin
-    {$IFDEF NoAutomatedBookmark}
-    DHS.GotoBookmark(P); //workaround for fix navigation problem
-    {$ELSE}
-    DHS.Bookmark:=P; //workaround for fix navigation problem
-    {$ENDIF}
-  end;
-
   {$IFDEF NoAutomatedBookmark}
+  P_26:=DHS.GetBookmark;
+  if DHS.CompareBookmarks(P_26, P)<>0 then
+    DHS.GotoBookmark(P); //workaround for fix navigation problem
   DHS.FreeBookmark(P);
+  DHS.FreeBookmark(P_26);
+  {$ELSE}
+  if DHS.CompareBookmarks(DHS.Bookmark, P)<>0 then
+    DHS.Bookmark:=P; //workaround for fix navigation problem
   {$ENDIF}
 
+
   Dec(FInProcessCalc);
   if FInProcessCalc < 0 then
     FInProcessCalc := 0;