Fix extra iterations trigger
Fix redundant computation triggering