Fix my last-second refactoring