diff --git a/src/Battling/ScriptHandling/ScriptAggregator.hpp b/src/Battling/ScriptHandling/ScriptAggregator.hpp
index da329ac..6ddb334 100644
--- a/src/Battling/ScriptHandling/ScriptAggregator.hpp
+++ b/src/Battling/ScriptHandling/ScriptAggregator.hpp
@@ -40,7 +40,9 @@ namespace CreatureLib::Battling {
 
         inline void Reset() {
             _index = 0;
-            _setIndex = -1;
+            if (_scripts[_index].IsSet()) {
+                _setIndex = -1;
+            }
             IncrementToNextNotNull(false);
         }
         inline bool HasNext() { return _index < _size; }