CNF build fixed