fix wushuang and huanshi