refactoring №3
fix