fix refactoring problem