Upstream fix