Fixing CPF