fixed cb bug