fix cb bug