Fixing x509 for all methods