diff --git a/Source/HtmlRenderer.PdfSharp/Adapters/PdfSharpAdapter.cs b/Source/HtmlRenderer.PdfSharp/Adapters/PdfSharpAdapter.cs
index e5fa309c0..cf1a9b7db 100644
--- a/Source/HtmlRenderer.PdfSharp/Adapters/PdfSharpAdapter.cs
+++ b/Source/HtmlRenderer.PdfSharp/Adapters/PdfSharpAdapter.cs
@@ -1,4 +1,4 @@
-// "Therefore those skilled at the unorthodox
+// "Therefore those skilled at the unorthodox
 // are infinite as heaven and earth,
 // inexhaustible as the great rivers.
 // When they come to an end,
@@ -119,14 +119,14 @@ protected override RImage ImageFromStreamInt(Stream memoryStream)
 
         protected override RFont CreateFontInt(string family, double size, RFontStyle style)
         {
-            var fontStyle = (XFontStyle)((int)style);
+            var fontStyle = (XFontStyleEx)((int)style);
             var xFont = new XFont(family, size, fontStyle, new XPdfFontOptions(PdfFontEncoding.Unicode));
             return new FontAdapter(xFont);
         }
 
         protected override RFont CreateFontInt(RFontFamily family, double size, RFontStyle style)
         {
-            var fontStyle = (XFontStyle)((int)style);
+            var fontStyle = (XFontStyleEx)((int)style);
             var xFont = new XFont(((FontFamilyAdapter)family).FontFamily.Name, size, fontStyle, new XPdfFontOptions(PdfFontEncoding.Unicode));
             return new FontAdapter(xFont);
         }
diff --git a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
index 2ff483a96..37879c6e4 100644
--- a/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
+++ b/Source/HtmlRenderer.PdfSharp/HtmlRenderer.PdfSharp.csproj
@@ -6,6 +6,7 @@
 	<UseWinForms>true</UseWinForms>
 	<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
 	<EnableWindowsTargeting>true</EnableWindowsTargeting>
+	<Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
   <!-- NuGet Package Properties -->
   <PropertyGroup>
@@ -32,7 +33,7 @@ Features and Benefits:
     <ProjectReference Include="..\HtmlRenderer\HtmlRenderer.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="PDFsharp" Version="1.50.5147" />
+    <PackageReference Include="PDFsharp" Version="6.2.4" />
     <PackageReference Include="System.Drawing.Common" Version="10.0.1" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/HtmlRenderer/Core/Handlers/FontsHandler.cs b/Source/HtmlRenderer/Core/Handlers/FontsHandler.cs
index 83c037eac..0f56567a3 100644
--- a/Source/HtmlRenderer/Core/Handlers/FontsHandler.cs
+++ b/Source/HtmlRenderer/Core/Handlers/FontsHandler.cs
@@ -113,19 +113,19 @@ public RFont GetCachedFont(string family, double size, RFontStyle style)
             var font = TryGetFont(family, size, style);
             if (font == null)
             {
-                if (!_existingFontFamilies.ContainsKey(family))
+                //if (!_existingFontFamilies.ContainsKey(family))
+                //{
+                string mappedFamily;
+                if (_fontsMapping.TryGetValue(family, out mappedFamily))
                 {
-                    string mappedFamily;
-                    if (_fontsMapping.TryGetValue(family, out mappedFamily))
+                    font = TryGetFont(mappedFamily, size, style);
+                    if (font == null)
                     {
-                        font = TryGetFont(mappedFamily, size, style);
-                        if (font == null)
-                        {
-                            font = CreateFont(mappedFamily, size, style);
-                            _fontsCache[mappedFamily][size][style] = font;
-                        }
+                        font = CreateFont(mappedFamily, size, style);
+                        _fontsCache[mappedFamily][size][style] = font;
                     }
                 }
+                //}
 
                 if (font == null)
                 {
diff --git a/Source/HtmlRenderer/HtmlRenderer.csproj b/Source/HtmlRenderer/HtmlRenderer.csproj
index 273dcccf8..da700a2e5 100644
--- a/Source/HtmlRenderer/HtmlRenderer.csproj
+++ b/Source/HtmlRenderer/HtmlRenderer.csproj
@@ -5,6 +5,7 @@
     <RootNamespace>TheArtOfDev.HtmlRenderer</RootNamespace>
 	<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
 	<EnableWindowsTargeting>true</EnableWindowsTargeting>
+	<Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
   <!-- NuGet Package Properties -->
   <PropertyGroup>