Fixed dead loops (hopefully) the last time