Improve endless flag handling