more bug fix to fix cpf dependency issue