Fixed in upstream