diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index e56c30429..d9cc6df3a 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit e56c304296848713e9161bee766460df167bca42
+Subproject commit d9cc6df3a74e6a51cc7e76451457e99f906e4766
diff --git a/Aaru.Core/Statistics.cs b/Aaru.Core/Statistics.cs
index bca192207..f7688b186 100644
--- a/Aaru.Core/Statistics.cs
+++ b/Aaru.Core/Statistics.cs
@@ -38,7 +38,6 @@ using System.Linq;
 using System.Net;
 using System.Text;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 using System.Threading;
 using Aaru.CommonTypes.Interop;
 using Aaru.CommonTypes.Metadata;
@@ -335,11 +334,7 @@ public static class Statistics
                 #else
                             Aaru.Console.AaruConsole.DebugWriteLine("Submit stats", Localization.Core.Uploading_statistics);
                 #endif
-                    string json = JsonSerializer.Serialize(dto, new JsonSerializerOptions
-                    {
-                        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-                        WriteIndented          = true
-                    });
+                    string json = JsonSerializer.Serialize(dto, typeof(StatsDto), StatsDtoContext.Default);
 
                     byte[] jsonBytes = Encoding.UTF8.GetBytes(json);
                     var    request   = WebRequest.Create("https://www.aaru.app/api/uploadstatsv2");