diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py
index 6f27d558ec12b50d502ef0ce81ef71af4729003d..e6535722743daa85ebf5744b543b76c40cce5061 100644
--- a/modules/icing/pirep_goes.py
+++ b/modules/icing/pirep_goes.py
@@ -1540,7 +1540,7 @@ def time_filter_2(times, dt_str_0=None, dt_str_1=None, format_code='%Y-%m-%d_%H:
     keep_idxs = []
     keep_times = []
 
-    for ts, idx in enumerate(times):
+    for idx, ts in enumerate(times):
         if ts_0 <= ts < ts_1:
             keep_times.append(ts)
             keep_idxs.append(idx)
@@ -1579,8 +1579,8 @@ def collect(icing_times, icing_intensity):
 
     keep_idxs = [[[] for j in range(nbins)] for i in range(len(jdays))]
 
-    for jd in jdays:
-        fltr_times, fltr_idxs = time_filter_2(icing_times, '2019-'+jd+'_00:00', '2019-'+jd+'_00:00', format_code='%Y-%j_%H:%M')
+    for jidx, jd in enumerate(jdays):
+        fltr_times, fltr_idxs = time_filter_2(icing_times, '2019-'+jd+'_00:00', '2019-'+jd+'_23:59', format_code='%Y-%j_%H:%M')
         _, ts_edges = make_times('2019-'+jd+'_00:00', None, num_steps=6, format_code='%Y-%j_%H:%M', hours=4)
         bin_idxs = find_bin_index(np.array(ts_edges), np.array(fltr_times))