fixing the CFF