diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs
index 2c211ff86..a3be267b5 100644
--- a/Configuration/GlobalAssemblyInfo.cs
+++ b/Configuration/GlobalAssemblyInfo.cs
@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "6";
 	public const string Build = "2";
-	public const string Revision = "2383";
+	public const string Revision = "2385";
 
         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 e2623f2e3..8e9730f5d 100644
--- a/Configuration/Version.defs
+++ b/Configuration/Version.defs
@@ -1,4 +1,4 @@
 %MINOR%=6
-%REVISION%=2383
+%REVISION%=2385
 %COREVERSION%=2
 %MAJOR%=3
diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt
index b8f5211fb..172597958 100644
--- a/Release/pabcversion.txt
+++ b/Release/pabcversion.txt
@@ -1 +1 @@
-3.6.2.2383
+3.6.2.2385
diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh
index 3534f08a8..ad0463460 100644
--- a/ReleaseGenerators/PascalABCNET_version.nsh
+++ b/ReleaseGenerators/PascalABCNET_version.nsh
@@ -1 +1 @@
-!define VERSION '3.6.2.2383'
+!define VERSION '3.6.2.2385'
diff --git a/SyntaxVisitors/YieldVisitors/CollectClassFieldsVisitor.cs b/SyntaxVisitors/YieldVisitors/CollectClassFieldsVisitor.cs
index fa90c5950..b1eb9e8d9 100644
--- a/SyntaxVisitors/YieldVisitors/CollectClassFieldsVisitor.cs
+++ b/SyntaxVisitors/YieldVisitors/CollectClassFieldsVisitor.cs
@@ -43,14 +43,14 @@ namespace SyntaxVisitors
 
             if (cd.body == null)
                 return;
-            var fields = cd.body.class_def_blocks.SelectMany(cm => cm.members.Where(decl => decl is var_def_statement)
+            /*var fields = cd.body.class_def_blocks.SelectMany(cm => cm.members.Where(decl => decl is var_def_statement)
                                                                 .Select(decl1 => (decl1 as var_def_statement).vars.idents)
                                                                 .SelectMany(ids => ids.Select(id => id)));
             
 
-            CollectedFields.UnionWith(fields);
+            CollectedFields.UnionWith(fields);*/
 
-            /*foreach (var defs in cd.body.class_def_blocks)
+            foreach (var defs in cd.body.class_def_blocks)
             {
                 // Class members
                 foreach (var decl in defs.members)
@@ -67,7 +67,7 @@ namespace SyntaxVisitors
                         }
                     }
                 }
-            }*/
+            }
         }
 
     }
diff --git a/TestSuite/IntPtrAsLambdaParam.pas b/TestSuite/IntPtrAsLambdaParam.pas
index c05d69e5b..882f85ca7 100644
--- a/TestSuite/IntPtrAsLambdaParam.pas
+++ b/TestSuite/IntPtrAsLambdaParam.pas
@@ -1,4 +1,6 @@
 begin
   var cb: System.Action<System.IntPtr>;
   cb := i->exit();
+  var cb1: System.Action<System.UIntPtr>;
+  cb1 := i->exit();
 end.
\ No newline at end of file
diff --git a/TreeConverter/OpenMP/OpenMP.cs b/TreeConverter/OpenMP/OpenMP.cs
index 58f22ddff..9a0a3c521 100644
--- a/TreeConverter/OpenMP/OpenMP.cs
+++ b/TreeConverter/OpenMP/OpenMP.cs
@@ -1264,6 +1264,8 @@ namespace PascalABCCompiler.TreeConverter
                     return new PascalABCCompiler.SyntaxTree.named_type_reference(get_idents_from_dot_string(sem_type.name, sem_type.location), sem_type.location);
                 else if (sem_type is compiled_type_node ctn1 && ctn1.compiled_type == typeof(System.IntPtr))
                     return new PascalABCCompiler.SyntaxTree.named_type_reference(get_idents_from_dot_string("System.IntPtr", sem_type.location), sem_type.location);
+                else if (sem_type is compiled_type_node ctn2 && ctn2.compiled_type == typeof(System.UIntPtr))
+                    return new PascalABCCompiler.SyntaxTree.named_type_reference(get_idents_from_dot_string("System.UIntPtr", sem_type.location), sem_type.location);
                 else
                     return new PascalABCCompiler.SyntaxTree.named_type_reference(get_idents_from_dot_string(sem_type.PrintableName, sem_type.location), sem_type.location);
             }