Fix to CPF creation bug
Fix to CPF creation bug