fixes merged upstream