diff --git a/demos/python_scripts_examples/gen_gerber_and_drill_files_board.py b/demos/python_scripts_examples/gen_gerber_and_drill_files_board.py
index ad2436a20d..6231ea9216 100644
--- a/demos/python_scripts_examples/gen_gerber_and_drill_files_board.py
+++ b/demos/python_scripts_examples/gen_gerber_and_drill_files_board.py
@@ -57,7 +57,6 @@ popt.SetUseGerberAttributes(True)
 popt.SetIncludeGerberNetlistInfo(True)
 popt.SetCreateGerberJobFile(gen_job_file)
 popt.SetUseGerberProtelExtensions(False)
-popt.SetExcludeEdgeLayer(False);
 popt.SetUseAuxOrigin(True)
 
 # This by gerbers only
@@ -91,6 +90,8 @@ plot_plan = [
 ]
 
 
+# In Gerber format, Set layer before calling OpenPlotfile is mandatory to generate
+# the right Gerber file header.
 for layer_info in plot_plan:
     if layer_info[1] <= B_Cu:
         popt.SetSkipPlotNPTH_Pads( True )
diff --git a/demos/python_scripts_examples/plot_board.py b/demos/python_scripts_examples/plot_board.py
index 732d11f215..f607ee3850 100644
--- a/demos/python_scripts_examples/plot_board.py
+++ b/demos/python_scripts_examples/plot_board.py
@@ -41,7 +41,6 @@ popt.SetAutoScale(False)
 popt.SetScale(1)
 popt.SetMirror(False)
 popt.SetUseGerberAttributes(True)
-popt.SetExcludeEdgeLayer(False);
 popt.SetScale(1)
 popt.SetUseAuxOrigin(True)
 
@@ -71,6 +70,8 @@ plot_plan = [
 ]
 
 
+# In Gerber format, Set layer before calling OpenPlotfile is mandatory to generate
+# the right Gerber file header.
 for layer_info in plot_plan:
     pctl.SetLayer(layer_info[1])
     pctl.OpenPlotfile(layer_info[0], PLOT_FORMAT_GERBER, layer_info[2])