Fix certified logic