Add upstream fix