fix CPE creation with new fields