Actually fix the regression