fix after upstream commit