Fix after last change