Fix Cangxiang and Huagai