diff --git a/components/fpspreadsheet/source/common/fpsexprparser.pas b/components/fpspreadsheet/source/common/fpsexprparser.pas
index 9249b1ecf..a2b5b489a 100644
--- a/components/fpspreadsheet/source/common/fpsexprparser.pas
+++ b/components/fpspreadsheet/source/common/fpsexprparser.pas
@@ -1197,7 +1197,7 @@ var
 begin
   C := CurrentChar;
   prevC := #0;
-  while (not IsWordDelim(C) or (prevC = 'E')) and (C <> cNull) do
+  while (not IsWordDelim(C) or (prevC = 'E') or (C = FParser.FFormatSettings.DecimalSeparator)) and (C <> cNull) do
   begin
     if not ( IsDigit(C)
              or ((FToken <> '') and (Upcase(C) = 'E'))
@@ -2054,7 +2054,6 @@ begin
     exit;
   FFormatSettings := AFormatSettings;
   UpdateExprFormatSettings;
-//  ExprFormatSettings := AFormatSettings;
   FExpression := AValue;
   if (AValue <> '') and (AValue[1] = '=') then
     FScanner.Source := Copy(AValue, 2, Length(AValue))