fix after last merge from upstream