add upstream fix