US5995: Fixing UT and AT