fix last refactoring