Make hoisting CPS compliant