Effective CPS fix, take 2