CPS fix