Fix to CPF creation bug