fix for certs
Merge