fixed in upstream