Hotfix/certificates