Better handling of AMD