Fixed CPE support.