Fixed bug wtih last commit, back to ~180 CPE