Avoid Infinite Loops

Last updated