CC1.5 fix again