fix shangyi