Support CB 1.7.5