Fixed Bug with older CC versions