Fix CFI