diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py
index 1a94aa9740897587600876c808b020ad04e362e2..b416b51c89aa3e58c5ec94f7b5db4673c81bae08 100644
--- a/modules/icing/pirep_goes.py
+++ b/modules/icing/pirep_goes.py
@@ -710,18 +710,20 @@ def run_daynight(filename, filename_l1b, day_night='ANY'):
     f_l1b = h5py.File(filename_l1b, 'r')
 
     solzen = f['solar_zenith_angle'][:, y_a:y_b, x_a:x_b]
+    satzen = f['sensor_zenith_angle'][:, y_a:y_b, x_a:x_b]
     num_obs = solzen.shape[0]
 
     idxs = []
     for i in range(num_obs):
-        if day_night == 'NIGHT':
-            if is_night(solzen[i,]):
-                idxs.append(i)
-        elif day_night == 'DAY':
-            if is_day(solzen[i,]):
-                idxs.append(i)
-        else:
+        if not check_oblique(satzen[i,]):
+            continue
+        if day_night == 'NIGHT' and is_night(solzen[i,]):
+            idxs.append(i)
+        elif day_night == 'DAY' and is_day(solzen[i,]):
             idxs.append(i)
+        elif day_night == 'ANY':
+            if is_day(solzen[i,]) or is_night(solzen[i,]):
+                idxs.append(i)
 
     keep_idxs = np.array(idxs)