fixed refactoring regression