fixing broken build after refactoring