diff --git a/Svelto.ECS/ExecuteOnEntitiesDB.cs b/Svelto.ECS/ExecuteOnEntitiesDB.cs
index 5b35f46..a32b9d0 100644
--- a/Svelto.ECS/ExecuteOnEntitiesDB.cs
+++ b/Svelto.ECS/ExecuteOnEntitiesDB.cs
@@ -176,7 +176,7 @@ namespace Svelto.ECS.Internal
                     for (int i = 0; i < innerCount; i++)
                         action(ref entities[i]);
 
-                    SafetyChecks(casted, count);
+                    SafetyChecks(casted, innerCount);
                 }
             }
         }
@@ -202,7 +202,7 @@ namespace Svelto.ECS.Internal
                     for (int i = 0; i < innerCount; i++)
                         action(ref entities[i], ref value);
 
-                    SafetyChecks(casted, count);
+                    SafetyChecks(casted, innerCount);
                 }
             }
         }