Actually fix bug from last commit