diff --git a/src/yadism/runner.py b/src/yadism/runner.py
index d69f747b..2498b8d7 100644
--- a/src/yadism/runner.py
+++ b/src/yadism/runner.py
@@ -216,7 +216,7 @@ def replace_nans_with_0(self, out):
         # Loop through each observable in the dictionary
         for observable, points in out2.items():
             # Skip the keys that are not an observable
-            if observable in ['xgrid', 'polynomial_degree', 'is_log', 'pids', 'projectilePID']:
+            if observable not in observable_name.kinds:
                 continue
 
             # Loop over the kinematic points