Cbbiong design fix

Please review and accept my pull request. Thank you.