Fix refactoring.