Resolved a minor issue regarding the new cpf implementation