Fix the AT due to UI changes