Fix migrated AT support