fix for CC 1.6 changes