another fix
Merge branch 'fixCertIssue'