cc 1.6 compatibility update