diff --git a/plotter.py b/plotter.py
index e5ba1bc..dd0dcea 100644
--- a/plotter.py
+++ b/plotter.py
@@ -408,7 +408,7 @@ class Plotter(Aggregator, BaseProcessor):
             for i, (run, num) in enumerate(run_num):
 
                 # Find filename
-                if not onefigure or movie:
+                if movie or not onefigure:
                     plot_filename = self._find_filename(name_full, run, num)
 
                 # Find ax
@@ -515,7 +515,7 @@ class Plotter(Aggregator, BaseProcessor):
                 tag_name = "_" + tag_name
 
             if run is not None and num is not None:
-                fmt = "{out}/{run}{subfolder}/{name}{tag}_{run}{ext}"
+                fmt = "{out}/{run}{subfolder}/{name}{tag}_{run}_{num:05}{ext}"
             elif run is not None:
                 fmt = "{out}/{run}{subfolder}/{name}{tag}_{run}{ext}"
             else: