1.5 Fix, Works for older CC