Fix save_cpo (again)