diff --git a/pylot/core/pick/autopick.py b/pylot/core/pick/autopick.py
index 2fb98e8e..ab46963d 100644
--- a/pylot/core/pick/autopick.py
+++ b/pylot/core/pick/autopick.py
@@ -100,9 +100,9 @@ def autopickevent(data, param, iplot=0, fig_dict=None, fig_dict_wadatijack=None,
 
     # quality control
     # median check and jackknife on P-onset times
-    jk_checked_onsets = checkPonsets(all_onsets, mdttolerance, jackfactor, 1, fig_dict_wadatijack)
+    jk_checked_onsets = checkPonsets(all_onsets, mdttolerance, jackfactor, iplot, fig_dict_wadatijack)
     # check S-P times (Wadati)
-    wadationsets = wadaticheck(jk_checked_onsets, wdttolerance, 1, fig_dict_wadatijack)
+    wadationsets = wadaticheck(jk_checked_onsets, wdttolerance, iplot, fig_dict_wadatijack)
     return wadationsets
 
 
diff --git a/pylot/core/pick/utils.py b/pylot/core/pick/utils.py
index 803524c3..96878c4d 100644
--- a/pylot/core/pick/utils.py
+++ b/pylot/core/pick/utils.py
@@ -684,7 +684,7 @@ def wadaticheck(pickdic, dttolerance, iplot=0, fig_dict=None):
         wfitflag = 1
 
     # plot results
-    if iplot > 0:
+    if iplot > 0 or fig_dict:
         if fig_dict:
             fig = fig_dict['wadati']
             linecolor = fig_dict['plot_style']['linecolor']['rgba_mpl']
@@ -926,7 +926,7 @@ def checkPonsets(pickdic, dttolerance, jackfactor=5, iplot=0, fig_dict=None):
 
     checkedonsets = pickdic
 
-    if iplot > 0:
+    if iplot > 0 or fig_dict:
         if fig_dict:
             fig = fig_dict['jackknife']
             plt_flag = 0