Fixes CPs export