fix failed refactoring