Fixing more looping issues