Attempt to fix CC Compatibility