pull in upstream fix