Fix NiePan and FuLi