Fix HuaShen
Fix SongWei