CFP 3.0.9.229 BETA Workarounds