fixed CF build