Fix the refactoring