Fix CFI 2