Fixed failed refactoring.