fix after refactoring