upstream fix applied