ensure that correct servername is set