Fix CFI 3