OK, I think the endless loop bug is really solved this time.