Fixed bug that was found during certification