Bug fix in certificates