update to upstream & fix upstream bug