diff --git a/packages/fcl-base/src/contnrs.pp b/packages/fcl-base/src/contnrs.pp
index fc562e09eb..1e97425635 100644
--- a/packages/fcl-base/src/contnrs.pp
+++ b/packages/fcl-base/src/contnrs.pp
@@ -15,6 +15,7 @@
 {$endif}
 {$H+}
 {$ifdef CLASSESINLINE}{$inline on}{$endif}
+{$IFOPT R+}{$DEFINE RangeChecking}{$ENDIF}
 
 unit Contnrs;
 
@@ -1928,6 +1929,7 @@ end;
 
 { Default hash Function }
 
+{$IFDEF RangeChecking}{$R-}{$ENDIF}
 Function RSHash(const S: string; const TableSize: Longword): Longword;
 const
   b = 378551;
@@ -1945,6 +1947,7 @@ begin
       end;
   Result:=(Result and $7FFFFFFF) mod TableSize;
 end;
+{$IFDEF RangeChecking}{$R+}{$ENDIF}
 
 { THTNode }
 
diff --git a/packages/fcl-base/src/pascodegen.pp b/packages/fcl-base/src/pascodegen.pp
index 8aaee4aece..641e73d66e 100644
--- a/packages/fcl-base/src/pascodegen.pp
+++ b/packages/fcl-base/src/pascodegen.pp
@@ -194,8 +194,6 @@ begin
   AddLn('}');
 end;
 
-
-
 constructor TPascalCodeGenerator.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);