Better handling for AS