fixed shangyi