Prevent "looping" #2