Fixed crashing bug from certification attempt