Fix after last merge