diff --git a/auto/Examples/scatter2d/Interference1DLattice.py b/auto/Examples/scatter2d/Interference1DLattice.py
index 470edc277417d62b03e3d9d42caa817d3acb124b..5320e0afc03a5195b91faa6363ef7a1ea37f4dce 100755
--- a/auto/Examples/scatter2d/Interference1DLattice.py
+++ b/auto/Examples/scatter2d/Interference1DLattice.py
@@ -66,7 +66,5 @@ if __name__ == '__main__':
     sample = get_sample()
     simulation = get_simulation(sample)
     result = simulation.simulate()
-    plotargs = bp.parse_commandline()
-    plotargs['intensity_min'] = 1e-03
-    bp.plot_simulation_result(result, **plotargs)
+    bp.plot_simulation_result(result, intensity_min=1e-3)
     bp.plt.show()
diff --git a/auto/Examples/specular/FootprintCorrection.py b/auto/Examples/specular/FootprintCorrection.py
index e6fb62cf30c11dc5c21ec9e0bb3ad4c150dfe108..0f65a7cd0ecaa3ca04d14aff72fa3b51a50d4ddb 100755
--- a/auto/Examples/specular/FootprintCorrection.py
+++ b/auto/Examples/specular/FootprintCorrection.py
@@ -29,7 +29,5 @@ if __name__ == '__main__':
         simulate(None, "Without footprint"),
     ]
 
-    plotargs = bp.parse_commandline()
-    plotargs['legendloc'] = 'lower left'
-    bp.plot_multicurve(results, **plotargs)
+    bp.plot_multicurve(results, legendloc='lower left')
     bp.plt.show()
diff --git a/rawEx/scatter2d/Interference1DLattice.py b/rawEx/scatter2d/Interference1DLattice.py
index 1b4edde036c604e0222b86a165a5922b9125d6e9..436a253a08d2873e9b9833d91efc4c054c9037b6 100755
--- a/rawEx/scatter2d/Interference1DLattice.py
+++ b/rawEx/scatter2d/Interference1DLattice.py
@@ -66,11 +66,12 @@ if __name__ == '__main__':
     sample = get_sample()
     simulation = get_simulation(sample)
     result = simulation.simulate()
+    <%- if test_mode or figure_mode -%>
     plotargs = bp.parse_commandline()
     plotargs['intensity_min'] = 1e-03
     bp.plot_simulation_result(result, **plotargs)
-    <%- if test_mode or figure_mode -%>
     bp.export(**plotargs)
     <%- else -%>
+    bp.plot_simulation_result(result, intensity_min=1e-3)
     bp.plt.show()
     <%- end -%>
diff --git a/rawEx/specular/FootprintCorrection.py b/rawEx/specular/FootprintCorrection.py
index fbcbd15424c50ee9d128012ed9fdfb2515213ca3..7ae37fe1306fd7ec6a849973885bb316c5a83efd 100755
--- a/rawEx/specular/FootprintCorrection.py
+++ b/rawEx/specular/FootprintCorrection.py
@@ -29,11 +29,12 @@ if __name__ == '__main__':
         simulate(None, "Without footprint"),
     ]
 
+    <%- if test_mode or figure_mode -%>
     plotargs = bp.parse_commandline()
     plotargs['legendloc'] = 'lower left'
     bp.plot_multicurve(results, **plotargs)
-    <%- if test_mode or figure_mode -%>
     bp.export(**plotargs)
     <%- else -%>
+    bp.plot_multicurve(results, legendloc='lower left')
     bp.plt.show()
     <%- end -%>