Added better loop validation for the delegation event