Fix for CC