fixed because of refactoring