Fix for 2.7

Yes I know fqdn is ont always your certname but it is in testing