added better compatibility handling for CCR