CPIDList fix