Fix refactoring problem