diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs
index b4b7c6e25..a15586e66 100644
--- a/Configuration/GlobalAssemblyInfo.cs
+++ b/Configuration/GlobalAssemblyInfo.cs
@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "2";
 	public const string Minor = "2";
 	public const string Build = "0";
-	public const string Revision = "957";
+	public const string Revision = "958";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
diff --git a/Configuration/Version.defs b/Configuration/Version.defs
index 9765bd644..62c4eab41 100644
--- a/Configuration/Version.defs
+++ b/Configuration/Version.defs
@@ -1,4 +1,4 @@
+%MINOR%=2
+%REVISION%=958
 %MAJOR%=2
 %COREVERSION%=0
-%MINOR%=2
-%REVISION%=957
diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y
index 67c45421f..56b263758 100644
--- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y
+++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y
@@ -1354,7 +1354,7 @@ proc_type_decl
     	{
     		$$ = new modern_proc_type(null,$2 as enumerator_list,$5,@$);
     	}
-    | simple_type_identifier tkArrow tkRoundOpen tkRoundClose
+    | simple_type_identifier tkArrow tkRoundOpen tkRoundClose // эти 2 правила нельзя объединять в одно template_param - будет конфликт
     	{
     		$$ = new modern_proc_type($1,null,null,@$);
     	}
diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh
index 1e142a038..c8f88f458 100644
--- a/ReleaseGenerators/PascalABCNET_version.nsh
+++ b/ReleaseGenerators/PascalABCNET_version.nsh
@@ -1 +1 @@
-!define VERSION '2.2.0.957'
\ No newline at end of file
+!define VERSION '2.2.0.958'
\ No newline at end of file
diff --git a/SyntaxTree/tree/tree.nin b/SyntaxTree/tree/tree.nin
index 320f18e49..30cf72951 100644
Binary files a/SyntaxTree/tree/tree.nin and b/SyntaxTree/tree/tree.nin differ
diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas
index 0be937923..c69de52a1 100644
--- a/TestSuite/CompilationSamples/PABCSystem.pas
+++ b/TestSuite/CompilationSamples/PABCSystem.pas
@@ -2239,7 +2239,6 @@ end;
 procedure TypedSet.AssignSetFrom(s: TypedSet);
 begin
   ht := s.ht.Clone() as Hashtable;
-  //copy_ht := s.ht;
   Clip;
 end;
 
@@ -2279,12 +2278,10 @@ begin
   while i.MoveNext do
     if not (i.Current is IComparable) then
     begin
-      //if IsInDiapason(i.Current) then
       result := (added ? result + ',' : '') + FormatStr(i.Current);
       added := true;
     end
     else
-    //if IsInDiapason(i.Current) then
     begin
       if (t <> nil) and (t <> i.Current.GetType) then
       begin
diff --git a/bin/Lib/PABCRtl.dll b/bin/Lib/PABCRtl.dll
index 10803c484..181332967 100644
Binary files a/bin/Lib/PABCRtl.dll and b/bin/Lib/PABCRtl.dll differ
diff --git a/bin/Lib/PABCSystem.pas b/bin/Lib/PABCSystem.pas
index 0be937923..c69de52a1 100644
--- a/bin/Lib/PABCSystem.pas
+++ b/bin/Lib/PABCSystem.pas
@@ -2239,7 +2239,6 @@ end;
 procedure TypedSet.AssignSetFrom(s: TypedSet);
 begin
   ht := s.ht.Clone() as Hashtable;
-  //copy_ht := s.ht;
   Clip;
 end;
 
@@ -2279,12 +2278,10 @@ begin
   while i.MoveNext do
     if not (i.Current is IComparable) then
     begin
-      //if IsInDiapason(i.Current) then
       result := (added ? result + ',' : '') + FormatStr(i.Current);
       added := true;
     end
     else
-    //if IsInDiapason(i.Current) then
     begin
       if (t <> nil) and (t <> i.Current.GetType) then
       begin
diff --git a/bin/PascalABCNET.chm b/bin/PascalABCNET.chm
index baa360382..51ae20bc7 100644
Binary files a/bin/PascalABCNET.chm and b/bin/PascalABCNET.chm differ