Fix Infinite Looping