Fix after last commit