Fix a previous refactoring