upstream fix