patch merged in upstream