diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e1afe20..0546f4e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ CHANGELOG for FlatCAM Evo beta
 
 - Pdf Import plugin: fixed an issue with assigning a wrong property to a Qtimer
 - Extract Plugin and Punch gerber Plugin: fixed a wrong build of the UI triggered even those tools where not launched yet
+- Pdf import Plugin: made sure that the keys in tools are integers
+- Pdf Import Plugin: added the source code to the imported Gerber file
 
 25.05.2023
 
diff --git a/appPlugins/ToolPDF.py b/appPlugins/ToolPDF.py
index 83eb7df3..1a18e3f7 100644
--- a/appPlugins/ToolPDF.py
+++ b/appPlugins/ToolPDF.py
@@ -23,7 +23,7 @@ import appTranslation as fcTranslate
 import builtins
 
 from appParsers.ParsePDF import PdfParser
-from camlib import grace
+from camlib import grace, flatten_shapely_geometry
 
 HAS_PIKE_MODULE = True
 try:
@@ -366,8 +366,13 @@ class ToolPDF(AppTool):
             except ValueError:
                 pass
 
-            grb_obj.solid_geometry = deepcopy(poly_buff)
+            # make the apertures integers if they are not
+            grb_obj.tools = {int(key): value for key, value in grb_obj.tools.items()}
+
+            grb_obj.solid_geometry = flatten_shapely_geometry(poly_buff)
             grb_obj.follow_geometry = deepcopy(follow_buf)
+            grb_obj.source_file = app_obj.f_handlers.export_gerber(obj_name=outname, filename=None,
+                                                                   local_use=grb_obj, use_thread=False)
 
         with self.app.proc_container.new(_("Rendering PDF layer #%d ...") % int(layer_nr)):