Fix GuHuo and PinDian.