fix what broke while refactoring