modif in order to work with FQDN